diff options
Diffstat (limited to 'pkgs')
1319 files changed, 32799 insertions, 14795 deletions
diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 752088fcd8222..83c5af0a53fce 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -29,7 +29,7 @@ , curl , pcre , mount -, gnome +, zenity , Accelerate , Cocoa , WebKit @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libusb1 alsa-lib libjack2 - gnome.zenity + zenity alsa-tools libxcb xcbutil @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { # These X11 libs get dlopen'd, they cause visual bugs when unavailable. wrapProgram $out/bin/BespokeSynth \ --prefix PATH : '${lib.makeBinPath [ - gnome.zenity + zenity (python3.withPackages (ps: with ps; [ jedi ])) ]}' ''; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 35ba2666f0b6b..d90735294d446 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -17,6 +17,7 @@ libxml2, gsettings-desktop-schemas, gnome, + adwaita-icon-theme, wrapGAppsHook3, fetchpatch, }: @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { opusfile flac gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 4f49564898a9a..9d5c69858aef9 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub , gobject-introspection, makeWrapper, wrapGAppsHook3 , gtk3, gst_all_1, python3 -, gettext, gnome, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk -, iconTheme ? gnome.adwaita-icon-theme +, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk +, iconTheme ? adwaita-icon-theme , deviceDetectionSupport ? true , documentationSupport ? true , notificationSupport ? true diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0e6178006ccfc..eff5bd76c9f22 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gitUpdater , glibcLocales -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , intltool @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 71ac598000daf..247a3bb23ecb1 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,7 +12,7 @@ , glib , glib-networking , glibmm -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtkmm3 @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { glib glib-networking.out glibmm - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gtk3 gtkmm3 diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index dc4bf6333d384..79f0c61af78e7 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsa-lib, freetype, xorg, curl, libGL, libjack2, gnome +, alsa-lib, freetype, xorg, curl, libGL, libjack2, zenity , pkg-config, makeWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 zenity ]; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -Dm755 build/helio $out/bin - wrapProgram $out/bin/helio --prefix PATH ":" ${gnome.zenity}/bin + wrapProgram $out/bin/helio --prefix PATH ":" ${zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index a6bcc68bf5a7a..3dd4a3006b2b9 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; # currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix index 8b90089ef23d2..ca6ab3d2bee61 100644 --- a/pkgs/applications/audio/mopidy/notify.nix +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/phijor/mopidy-notify"; description = "Mopidy extension for showing desktop notifications on track change"; license = licenses.asl20; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 4b6fe17e8225f..aac6ec43c305e 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -30,6 +30,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/mopidy/mopidy-spotify"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 8cf4e31b79e47..ba235b5157a51 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; }; } diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 60b9bc23bc362..c188465f52e99 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -88,7 +88,7 @@ buildNpmPackage rec { description = "Libre and modular OSC / MIDI controller"; homepage = "https://openstagecontrol.ammd.net/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "open-stage-control"; }; diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index 17105558f2d2b..289991a944316 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -83,7 +83,7 @@ buildDotnetModule rec { # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT unfreeRedistributable ]; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "OpenUtau"; }; diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index db5b89bb39fa0..a0b2972ca0375 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -5,7 +5,7 @@ , ffmpeg , libopus , makeBinaryWrapper -, nix-update-script +, unstableGitUpdater , openssl , pkg-config , stdenv @@ -35,7 +35,9 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath [ ffmpeg yt-dlp ]} ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = { description = "Hassle-free Discord music bot"; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 019c777cd046c..f6b8d20f91d2c 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -8,7 +8,7 @@ , libsigcxx , libcanberra-gtk3 , json-glib -, gnome +, adwaita-icon-theme , wrapGAppsHook3 }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libsigcxx libcanberra-gtk3 json-glib - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index dbb3a63fce6b7..933d173614593 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook3, pythonPackages, gtk3, gnome, gobject-introspection +, wrapGAppsHook3, pythonPackages, gtk3, adwaita-icon-theme, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ + [ gtk3 gobject-introspection libnotify libsecret adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix index 9af5c4a9fa85f..e58e5aabcd81a 100644 --- a/pkgs/applications/audio/plugdata/default.nix +++ b/pkgs/applications/audio/plugdata/default.nix @@ -9,7 +9,7 @@ , alsa-lib , freetype , webkitgtk -, gnome +, zenity , curl , xorg , python3 @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # These X11 libs get dlopen'd, they cause visual bugs when unavailable. wrapProgram $out/bin/plugdata \ --prefix PATH : '${lib.makeBinPath [ - gnome.zenity + zenity ]}' \ --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ xorg.libXrandr diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 72b06a0bab0e0..2c761897ce893 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-aXZsAOsdp0x7J0T9B9C1Qm2qDkhRNHRWUmPafdHRrOQ="; + sha256 = "sha256-1YExpvhCHIdRqFCvOmiG3G7k/qs7q1ITwtZXGMc/SRk="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 833b4e3b073a1..16786c77e4c6b 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.16"; + version = "7.17"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; - hash = if stdenv.isDarwin then "sha256-UMliD9tk8VDpeQ4tBC31peemv7HAKHW0xtqoSkzYG4Y=" else { - x86_64-linux = "sha256-sK0GVK29SGkLBILeWcFjcvQ956NCPb1HvqmXLeLbgP8="; - aarch64-linux = "sha256-mJ/UtrWaPq3Oar8rMvRFm8iafK1I7bL42deIQyiHVMk="; + hash = if stdenv.isDarwin then "sha256-4+8MhvQ1LhfyhFCOMBgD4HHt0Oaj25y2U04++JuXxCM=" else { + x86_64-linux = "sha256-q3oTKcFSNec10kT1FlDaf2GS967y38VLq9GsquwN2Lg="; + aarch64-linux = "sha256-5mxVkppm1SjC0C0SFI7uEdPWewNZXlrNAxbaFcNzzbU="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index c6a0ac824566f..3aa2b6cf6deb8 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libjack2, libsndfile, xorg, freetype -, libxkbcommon, cairo, glib, gnome, flac, libogg, libvorbis, libopus, cmake +, libxkbcommon, cairo, glib, zenity, flac, libogg, libvorbis, libopus, cmake , pango, pkg-config, catch2 }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libxkbcommon cairo glib - gnome.zenity + zenity freetype pango ]; @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { cp ${catch2}/include/catch2/catch.hpp tests/catch2/catch.hpp substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ - --replace 'zenitypath = "zenity"' 'zenitypath = "${gnome.zenity}/bin/zenity"' + --replace 'zenitypath = "zenity"' 'zenitypath = "${zenity}/bin/zenity"' substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \ - --replace '/usr/bin/zenity' '${gnome.zenity}/bin/zenity' + --replace '/usr/bin/zenity' '${zenity}/bin/zenity' ''; cmakeFlags = [ "-DSFIZZ_TESTS=ON" ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 8b6b9631a85d0..36c0f9239973b 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, wrapGAppsHook3, gettext -, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, adwaita-icon-theme, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -24,7 +24,7 @@ in buildPythonApplication rec { buildInputs = [ glib - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index bc1c72cf746e6..286e26bdaad38 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation rec { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; license = licenses.mit; - maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ]; + maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ef299ac7074cf..a2e2c4bc09ef7 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -11,6 +11,7 @@ , brasero , libcanberra-gtk3 , gnome +, adwaita-icon-theme , gst_all_1 , libmusicbrainz5 , libdiscid @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { gtk3 brasero libcanberra-gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid diff --git a/pkgs/applications/audio/spotify/darwin.nix b/pkgs/applications/audio/spotify/darwin.nix index 25899ad167835..e3066cc36dd1e 100644 --- a/pkgs/applications/audio/spotify/darwin.nix +++ b/pkgs/applications/audio/spotify/darwin.nix @@ -9,17 +9,17 @@ stdenv.mkDerivation { inherit pname; - version = "1.2.17.834.g26ee1129"; + version = "1.2.40.599.g606b7f29"; src = if stdenv.isAarch64 then ( fetchurl { - url = "https://web.archive.org/web/20230808124344/https://download.scdn.co/SpotifyARM64.dmg"; - sha256 = "sha256-u22hIffuCT6DwN668TdZXYedY9PSE7ZnL+ITK78H7FI="; + url = "https://web.archive.org/web/20240622065234/https://download.scdn.co/SpotifyARM64.dmg"; + hash = "sha256-mmjxKYmsX0rFlIU19JOfPbNgOhlcZs5slLUhDhlON1c="; }) else ( fetchurl { - url = "https://web.archive.org/web/20230808124637/https://download.scdn.co/Spotify.dmg"; - sha256 = "sha256-aaYMbZpa2LvyBeXmEAjrRYfYqbudhJHR/hvCNTsNQmw="; + url = "https://web.archive.org/web/20240622065548/https://download.scdn.co/Spotify.dmg"; + hash = "sha256-hvS0xnmJQoQfNJRFsLBQk8AJjDOzDy+OGwNOq5Ms/O0="; }); nativeBuildInputs = [ undmg ]; diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 8886e851c3c95..43b4ae243540e 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook3, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, zenity , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL # High-DPI support: Spotify's --force-device-scale-factor argument @@ -179,7 +179,7 @@ stdenv.mkDerivation { --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \ ''} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome.zenity}/bin" \ + --prefix PATH : "${zenity}/bin" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postFixup diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index bc53b296357b6..b3cc4dbd22097 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -18,7 +18,7 @@ , libXrender , libXxf86vm , libglvnd -, gnome +, zenity }: let @@ -39,7 +39,7 @@ let ]; runBinDeps = [ - gnome.zenity + zenity ]; in @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { description = "Next generation modular control surface"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; mainProgram = "TouchOSC"; }; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 7a1ded3e2f82a..0d02e5a686a12 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -7,7 +7,7 @@ , ghc_filesystem , glew , glfw -, gnome +, zenity , gtk3-x11 , imagemagick , jansson @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { # Fix reference to zenity substituteInPlace dep/osdialog/osdialog_zenity.c \ - --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"' + --replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${zenity}/bin/zenity"' ''; nativeBuildInputs = [ @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { ghc_filesystem glew glfw - gnome.zenity + zenity gtk3-x11 jansson libarchive diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index e2dfc14569845..c96b99162292b 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -17,7 +17,7 @@ , libxkbcommon , vulkan-loader , wayland -, gnome +, zenity , libsForQt5 }: @@ -85,7 +85,7 @@ rustPlatform.buildRustPackage rec { in '' patchelf --set-rpath "${libPath}" "$out/bin/ludusavi" - wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]} + wrapProgram $out/bin/ludusavi --prefix PATH : ${lib.makeBinPath [ zenity libsForQt5.kdialog ]} ''; diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/applications/backup/restic-integrity/default.nix index d0311e5d40d0a..c34b1a19405b4 100644 --- a/pkgs/applications/backup/restic-integrity/default.nix +++ b/pkgs/applications/backup/restic-integrity/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "CLI tool to check the integrity of a restic repository without unlocking it"; homepage = "https://git.nwex.de/networkException/restic-integrity"; license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "restic-integrity"; }; } diff --git a/pkgs/applications/blockchains/alfis/Cargo.lock b/pkgs/applications/blockchains/alfis/Cargo.lock index 997f44144daca..787f92246e7de 100644 --- a/pkgs/applications/blockchains/alfis/Cargo.lock +++ b/pkgs/applications/blockchains/alfis/Cargo.lock @@ -10,91 +10,64 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array", ] [[package]] name = "aes" -version = "0.6.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "aes-soft", - "aesni", - "cipher 0.2.5", + "cfg-if", + "cipher", + "cpufeatures", ] [[package]] name = "aes-gcm" -version = "0.8.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ - "aead 0.3.2", + "aead", "aes", - "cipher 0.2.5", + "cipher", "ctr", "ghash", "subtle", ] [[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher 0.2.5", - "opaque-debug", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher 0.2.5", - "opaque-debug", -] - -[[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "alfis" -version = "0.8.4" +version = "0.8.5" dependencies = [ - "base64 0.21.0", + "base64", "bincode", "blakeout", "byteorder", "chacha20poly1305", "chrono", "derive_more", - "digest 0.10.5", - "ecies-ed25519", + "digest 0.10.7", + "ecies-ed25519-ng", "ed25519-dalek", "getopts", "lazy_static", @@ -105,31 +78,43 @@ dependencies = [ "num-traits", "num_cpus", "open", - "rand 0.7.3", - "rand 0.8.5", + "rand", "serde", "serde_bytes", "serde_cbor", "serde_derive", "serde_json", - "sha2 0.10.6", - "signature 2.0.0", + "sha2", + "signature", "simplelog", "spmc", "sqlite", "thread-priority", - "time 0.3.14", + "time", "tinyfiledialogs", - "toml 0.7.2", + "toml 0.8.8", "ureq", "uuid", "web-view", "winapi", + "windows-service", "winres", "x25519-dalek", ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -152,21 +137,21 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" [[package]] -name = "base64" -version = "0.21.0" +name = "base64ct" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -189,7 +174,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac", "digest 0.9.0", "opaque-debug", ] @@ -206,18 +191,9 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] @@ -230,15 +206,15 @@ checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cairo-sys-rs" @@ -252,9 +228,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.71" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -264,68 +243,59 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", - "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" +checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.4.3", + "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.44", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] -name = "chunked_transfer" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" - -[[package]] name = "cipher" -version = "0.2.5" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", + "zeroize", ] [[package]] -name = "cipher" -version = "0.3.0" +name = "const-oid" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "convert_case" @@ -335,41 +305,36 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - -[[package]] name = "crc32fast" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] @@ -384,38 +349,62 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.10.1" +name = "ctr" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "generic-array", + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rustc_version", "subtle", + "zeroize", ] [[package]] -name = "ctr" -version = "0.6.0" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "cipher 0.2.5", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] -name = "curve25519-dalek" -version = "3.2.0" +name = "der" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", + "const-oid", "zeroize", ] [[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -425,7 +414,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn", + "syn 1.0.109", ] [[package]] @@ -439,73 +428,83 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.0", + "block-buffer", "crypto-common", + "subtle", ] [[package]] -name = "ecies-ed25519" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a882353828f086290bedd0b598e18863a4d2135f8e632c4325ed89a4e5535db" +name = "ecies-ed25519-ng" +version = "0.5.2" +source = "git+https://github.com/Revertron/ecies-ed25519-ng?rev=577c4f2#577c4f2635fc5ccfce24428c6238b3fff5308438" dependencies = [ "aes-gcm", "curve25519-dalek", - "digest 0.9.0", + "digest 0.10.7", "hex", "hkdf", - "rand 0.7.3", - "sha2 0.9.8", + "rand", + "sha2", "thiserror", "zeroize", ] [[package]] name = "ed25519" -version = "1.2.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature 1.6.0", + "pkcs8", + "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek", "ed25519", - "rand 0.7.3", "serde", - "sha2 0.9.8", + "sha2", + "subtle", "zeroize", ] [[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "fiat-crypto" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + +[[package]] name = "flate2" -version = "1.0.22" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if", "crc32fast", - "libc", "miniz_oxide", ] [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "matches", "percent-encoding", ] @@ -541,9 +540,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -560,31 +559,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.3" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "ghash" -version = "0.3.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug", "polyval", @@ -644,23 +632,18 @@ dependencies = [ [[package]] name = "half" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd566f08830dd1fa75b2a5f1d8def8336de7f08b2692a9a71efbe7188aea36f" - -[[package]] -name = "hashbrown" -version = "0.12.3" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", + "allocator-api2", ] [[package]] @@ -674,12 +657,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -689,64 +669,98 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.10.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "digest 0.9.0", "hmac", ] [[package]] name = "hmac" -version = "0.10.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "crypto-mac 0.10.1", - "digest 0.9.0", + "digest 0.10.7", ] [[package]] name = "iana-time-zone" -version = "0.1.47" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", - "once_cell", "wasm-bindgen", - "winapi", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", ] [[package]] name = "idna" -version = "0.2.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "indexmap" -version = "1.9.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "equivalent", + "hashbrown", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", ] [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "javascriptcore-rs-sys" @@ -759,9 +773,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -774,67 +788,57 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.9.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", ] [[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "wasi", + "windows-sys 0.48.0", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -843,9 +847,9 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -853,18 +857,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -881,9 +885,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -893,12 +897,13 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "open" -version = "3.0.3" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716" +checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" dependencies = [ + "is-wsl", + "libc", "pathdiff", - "windows-sys 0.36.1", ] [[package]] @@ -921,21 +926,37 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] [[package]] name = "pkg-config" -version = "0.3.20" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "platforms" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "poly1305" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug", @@ -944,71 +965,55 @@ dependencies = [ [[package]] name = "polyval" -version = "0.4.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" dependencies = [ - "cpuid-bool", + "cfg-if", + "cpufeatures", "opaque-debug", "universal-hash", ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.51" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1018,49 +1023,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core", ] [[package]] name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.3", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1074,52 +1060,67 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.2" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" dependencies = [ "log", "ring", - "sct", - "webpki", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", ] [[package]] -name = "ryu" -version = "1.0.5" +name = "rustls-pki-types" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" [[package]] -name = "sct" -version = "0.7.0" +name = "rustls-webpki" +version = "0.102.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] name = "semver" -version = "1.0.4" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] @@ -1136,20 +1137,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -1158,58 +1159,42 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[package]] name = "sha2" -version = "0.9.8" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest 0.10.7", ] [[package]] -name = "sha2" -version = "0.10.6" +name = "signature" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.5", + "rand_core", ] [[package]] -name = "signature" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ea32af43239f0d353a7dd75a22d94c329c8cdaafdcb4c1c1335aa10c298a4a" - -[[package]] -name = "signature" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" - -[[package]] name = "simplelog" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786" +checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" dependencies = [ "log", "termcolor", - "time 0.3.14", + "time", ] [[package]] @@ -1229,9 +1214,19 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] [[package]] name = "spmc" @@ -1241,9 +1236,9 @@ checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" [[package]] name = "sqlite" -version = "0.30.4" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1908664131c21a38e5b531344d52a196ec338af5bf44f7fa2c83d539e9561d" +checksum = "03801c10193857d6a4a71ec46cee198a15cbc659622aabe1db0d0bdbefbcf8e6" dependencies = [ "libc", "sqlite3-sys", @@ -1251,9 +1246,9 @@ dependencies = [ [[package]] name = "sqlite3-src" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1815a7a02c996eb8e5c64f61fcb6fd9b12e593ce265c512c5853b2513635691" +checksum = "bfc95a51a1ee38839599371685b9d4a926abb51791f0bc3bf8c3bb7867e6e454" dependencies = [ "cc", "pkg-config", @@ -1261,9 +1256,9 @@ dependencies = [ [[package]] name = "sqlite3-sys" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47c99824fc55360ba00caf28de0b8a0458369b832e016a64c13af0ad9fbb9ee" +checksum = "f2752c669433e40ebb08fde824146f50d9628aa0b66a3b7fc6be34db82a8063b" dependencies = [ "libc", "sqlite3-src", @@ -1284,14 +1279,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -1305,15 +1300,14 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1327,79 +1321,83 @@ dependencies = [ "strum", "strum_macros", "thiserror", - "toml 0.5.9", + "toml 0.5.11", "version-compare", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] name = "thread-priority" -version = "0.10.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978519ae4c6891352f964b88da4ab5a3a9b74a40247cda5baee145dae6cd3b71" +checksum = "b72cb4958060ee2d9540cef68bb3871fd1e547037772c7fe7650d5d1cbec53b3" dependencies = [ + "bitflags", "cfg-if", "libc", "log", + "rustversion", "winapi", ] [[package]] name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.14" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ + "deranged", "itoa", "libc", "num_threads", + "powerfmt", + "serde", + "time-core", "time-macros", ] [[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +dependencies = [ + "time-core", +] [[package]] name = "tinyfiledialogs" @@ -1413,33 +1411,33 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "toml" -version = "0.7.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -1449,18 +1447,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "serde", @@ -1471,91 +1469,83 @@ dependencies = [ [[package]] name = "typenum" -version = "1.14.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array", + "crypto-common", "subtle", ] [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" +version = "2.9.1" +source = "git+https://github.com/algesten/ureq#4ddcc3a27a6c8cb88041dc713010455f776fa753" dependencies = [ - "base64 0.13.1", - "chunked_transfer", + "base64", "flate2", "log", "once_cell", "rustls", + "rustls-pki-types", + "rustls-webpki", "url", - "webpki", "webpki-roots", ] [[package]] name = "url" -version = "2.2.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -1567,11 +1557,11 @@ checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb" [[package]] name = "uuid" -version = "1.3.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.3", + "getrandom", "serde", ] @@ -1589,27 +1579,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1617,24 +1595,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1642,37 +1620,27 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "web-sys" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-view" version = "0.7.3" -source = "git+https://github.com/Boscop/web-view#e87e08cab3a2d500d54068ec9c7aaa055a711465" +source = "git+https://github.com/Boscop/web-view#82d7cbce6228b1a964673cc0f22944ad808eab42" dependencies = [ "boxfnonce", "tinyfiledialogs", @@ -1703,28 +1671,18 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "webpki-roots" -version = "0.22.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" +checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" dependencies = [ - "webpki", + "rustls-pki-types", ] [[package]] name = "webview-sys" version = "0.6.2" -source = "git+https://github.com/Boscop/web-view#e87e08cab3a2d500d54068ec9c7aaa055a711465" +source = "git+https://github.com/Boscop/web-view#82d7cbce6228b1a964673cc0f22944ad808eab42" dependencies = [ "cc", "gdk-sys", @@ -1739,6 +1697,12 @@ dependencies = [ ] [[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1756,9 +1720,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -1770,110 +1734,219 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-service" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" +dependencies = [ + "bitflags", + "widestring", + "windows-sys 0.45.0", +] + +[[package]] name = "windows-sys" -version = "0.36.1" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.3.3" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -1884,37 +1957,57 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "toml 0.5.9", + "toml 0.5.11", ] [[package]] name = "x25519-dalek" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] [[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "zeroize" -version = "1.3.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.2.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn", - "synstructure", + "syn 2.0.48", ] diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index af1da19f63867..690fdc7734d15 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -1,62 +1,71 @@ -{ stdenv -, lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, makeWrapper -, webkitgtk -, zenity -, Cocoa -, Security -, WebKit -, withGui ? true +{ + stdenv, + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeWrapper, + webkitgtk, + zenity, + Cocoa, + Security, + WebKit, + withGui ? true, }: rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.8.4"; + version = "0.8.4-unstable-2024-03-08"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; - rev = "v${version}"; - sha256 = "sha256-BNpz4SjWeZ20CxjyEIaFI43X7P3uoyWqOQssFb38Gv8="; + rev = "28431ec0530405782038e7c02c2dedc3086bd7c9"; + hash = "sha256-HL4RRGXE8PIcD+zTF1xZSyOpKMhKF75Mxm6KLGsR4Hc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "web-view-0.7.3" = "sha256-8C/2bXAbxP5tdo9RLvNn89krzy08+yKy3kERfz31HJE="; + "ecies-ed25519-ng-0.5.2" = "sha256-E+jVbgKKK1DnJWAJN+xGZPCV2n7Gxp2t7XXkDNDnPN4="; + "ureq-2.9.1" = "sha256-ATT2wJ9kmY/Jjw6FEbxqM9pDytKFLmu/ZqH/pJpZTu8="; + "web-view-0.7.3" = "sha256-eVMcpMRZHwOdWhfV6Z1uGUNOmhB41YZPaiz1tRQvhrI="; }; }; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = + lib.optional stdenv.isDarwin Security + ++ lib.optional (withGui && stdenv.isLinux) webkitgtk + ++ lib.optionals (withGui && stdenv.isDarwin) [ + Cocoa + WebKit + ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ "doh" ] ++ lib.optional withGui "webgui"; + checkFlags = [ # these want internet access, disable them "--skip=dns::client::tests::test_tcp_client" "--skip=dns::client::tests::test_udp_client" ]; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = lib.optional stdenv.isDarwin Security - ++ lib.optional (withGui && stdenv.isLinux) webkitgtk - ++ lib.optionals (withGui && stdenv.isDarwin) [ Cocoa WebKit ]; - - buildNoDefaultFeatures = true; - buildFeatures = [ - "doh" - ] ++ lib.optional withGui "webgui"; - postInstall = lib.optionalString (withGui && stdenv.isLinux) '' wrapProgram $out/bin/alfis \ --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; - meta = with lib; { + meta = { description = "Alternative Free Identity System"; homepage = "https://alfis.name"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ misuzu ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ misuzu ]; + platforms = lib.platforms.unix; mainProgram = "alfis"; + broken = withGui && stdenv.isDarwin; }; } diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index ed470dec1f355..d2b90cf5952fd 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.60.1"; + version = "2.60.2"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-VZzDG9qUjEBSNxQcmkqPTTDQjh7BZFqyRSaCfio8X2I="; + hash = "sha256-+KUe+wpcE59Y6ktDRpoMXQYSML9sfN4OaDV8+sKfzQQ="; fetchSubmodules = true; }; - vendorHash = "sha256-38NmSSK3a70WvhZAZ529wdAMlEuk8/4YqtadoLOn1IY="; + vendorHash = "sha256-r8Hh0UGdUbVOx9r10ymb9bJNZvxm/MzAVA9D0BaIzJg="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 36344bf1a6e15..5f8b95411e99b 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.81.2"; + version = "2.83.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-dnlIIOOYmCN209avQFMcoekB7nJpc2dJnS2OBI+dq7E="; + hash = "sha256-W7K6jRM248PCsUEVhIPeb2em70QwKJ/20RgKzuwj29g="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 8361461fb7d37..f5d856ec1770c 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -21,13 +21,13 @@ , polkit , accountsservice , gtk-doc -, gnome , gobject-introspection , vala , fetchpatch , withQt5 ? false , qtbase , yelp-tools +, yelp-xsl }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome.yelp-xsl + yelp-xsl gobject-introspection gtk-doc intltool diff --git a/pkgs/applications/editors/android-studio-for-platform/common.nix b/pkgs/applications/editors/android-studio-for-platform/common.nix new file mode 100644 index 0000000000000..b0e7e1c839a42 --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/common.nix @@ -0,0 +1,184 @@ +{ channel, pname, version, sha256Hash }: + +{ android-tools +, bash +, buildFHSEnv +, coreutils +, dpkg +, e2fsprogs +, fetchurl +, findutils +, git +, gnugrep +, gnused +, gnutar +, gtk2, glib +, gzip +, fontsConf +, fontconfig +, freetype +, libX11 +, libXext +, libXi +, libXrandr +, libXrender +, libXtst +, makeFontsConf +, makeWrapper +, ncurses5 +, openssl +, ps +, python3 +, lib +, stdenv +, unzip +, usbutils +, which +, runCommand +, xkeyboard_config +, zip +, zlib +, makeDesktopItem +, tiling_wm ? false # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +}: + +let + drvName = "${pname}-${version}"; + filename = "asfp-${version}-linux.deb"; + + androidStudioForPlatform = stdenv.mkDerivation { + name = "${drvName}-unwrapped"; + + src = fetchurl { + url = "https://dl.google.com/android/asfp/${filename}"; + sha256 = sha256Hash; + }; + + nativeBuildInputs = [ + dpkg + makeWrapper + ]; + + installPhase = '' + cp -r "./opt/${pname}/" $out + wrapProgram $out/bin/studio.sh \ + --set-default JAVA_HOME "$out/jbr" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ + --set FONTCONFIG_FILE ${fontsConf} \ + --prefix PATH : "${lib.makeBinPath [ + + # Checked in studio.sh + coreutils + findutils + gnugrep + which + gnused + + # Used during setup wizard + gnutar + gzip + + # Runtime stuff + git + ps + usbutils + android-tools + + # For Soong sync + openssl + python3 + unzip + zip + e2fsprogs + ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst + libX11 + + # Support multiple monitors + libXrandr + + # For GTKLookAndFeel + gtk2 + glib + + # For Soong sync + e2fsprogs + ]}" + ''; + }; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + desktopName = "Android Studio for Platform (${channel} channel)"; + comment = "The official Android IDE for Android platform development"; + categories = [ "Development" "IDE" ]; + startupNotify = true; + startupWMClass = "jetbrains-studio"; + }; + + # Android Studio for Platform downloads prebuilt binaries as part of the SDK. These tools + # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS + # environment is used as a work around for that. + fhsEnv = buildFHSEnv { + name = "${drvName}-fhs-env"; + multiPkgs = pkgs: [ + zlib + ncurses5 + ncurses5.dev + ]; + profile = '' + export ALLOW_NINJA_ENV=true + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32 + ''; + }; +in runCommand + drvName + { + startScript = '' + #!${bash}/bin/bash + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudioForPlatform}/bin/studio.sh "$@" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + passthru = { + unwrapped = androidStudioForPlatform; + }; + meta = with lib; { + description = "The Official IDE for Android platform development"; + longDescription = '' + Android Studio for Platform (ASfP) is the version of the Android Studio IDE + for Android Open Source Project (AOSP) platform developers who build with the Soong build system. + ''; + homepage = "https://developer.android.com/studio/platform.html"; + license = with licenses; [ asl20 unfree ]; # The code is under Apache-2.0, but: + # If one selects Help -> Licenses in Android Studio, the dialog shows the following: + # "Android Studio includes proprietary code subject to separate license, + # including JetBrains CLion(R) (www.jetbrains.com/clion) and IntelliJ(R) + # IDEA Community Edition (www.jetbrains.com/idea)." + # Also: For actual development the Android SDK is required and the Google + # binaries are also distributed as proprietary software (unlike the + # source-code itself). + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ robbins ]; + mainProgram = pname; + }; + } + '' + mkdir -p $out/{bin,share/pixmaps} + + echo -n "$startScript" > $out/bin/${pname} + chmod +x $out/bin/${pname} + + ln -s ${androidStudioForPlatform}/bin/studio.png $out/share/pixmaps/${pname}.png + ln -s ${desktopItem}/share/applications $out/share/applications + '' diff --git a/pkgs/applications/editors/android-studio-for-platform/default.nix b/pkgs/applications/editors/android-studio-for-platform/default.nix new file mode 100644 index 0000000000000..1f11bd55ac3a7 --- /dev/null +++ b/pkgs/applications/editors/android-studio-for-platform/default.nix @@ -0,0 +1,31 @@ +{ callPackage, makeFontsConf, buildFHSEnv, tiling_wm ? false }: + +let + mkStudio = opts: callPackage (import ./common.nix opts) { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + inherit buildFHSEnv; + inherit tiling_wm; + }; + stableVersion = { + version = "2023.2.1.20"; # Android Studio Iguana | 2023.2.1 Beta 2 + sha256Hash = "sha256-cM/pkSghqLUUvJVF/OVLDOxVBJlJLH8ge1bfZtDUegY="; + }; + canaryVersion = { + version = "2023.3.2.1"; # Android Studio Jellyfish | 2023.3.2 Canary 1 + sha256Hash = "sha256-XOsbMyNentklfEp1k49H3uFeiRNMCV/Seisw9K1ganM="; + }; +in { + # Attributes are named by their corresponding release channels + + stable = mkStudio (stableVersion // { + channel = "stable"; + pname = "android-studio-for-platform"; + }); + + canary = mkStudio (canaryVersion // { + channel = "canary"; + pname = "android-studio-for-platform-canary"; + }); +} diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index d9140fc1ea8c3..d560254ee1e69 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -8,7 +8,7 @@ , enchant , gucharmap , python3 -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gtk libxml2 enchant diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index b85128816aa61..944fc6c49463b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "4bfbbe4e6c44d80b15cb501fa3444ad03dba2824"; + rev = "9e88e660d717ba597d9fe9366cf4278674734410"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240622.236"; + version = "20240629.1404"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-rzaUtUYDEZAuRjSgThHKxrQ7U8ZIO0k750aH08VpA08="; + hash = "sha256-qpetTKZDQjoofp8ggothYALQBpwLjuNxCq46Pe4oZZA="; }; commit = rev; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 2c9ecd828a643..efa6aaf4cbdbd 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -12,6 +12,7 @@ , libgedit-gtksourceview , libgedit-tepl , libgee +, adwaita-icon-theme , gnome , glib , pkg-config @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme glib gsettings-desktop-schemas gspell diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix index 1ad346ed01de0..d2203a714c374 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Simple text editor forked from Leafpad using GTK+ 3.x"; homepage = "https://github.com/stevenhoneyman/l3afpad"; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; mainProgram = "l3afpad"; }; diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 8f9a5b880032c..438c9904829c6 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -7,7 +7,6 @@ , ruby , lua , python3Packages -, writeText , wrapNeovimUnstable , runCommand }: @@ -78,7 +77,7 @@ let ++ (extraPython3Packages ps) ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - luaEnv = neovim-unwrapped.lua.withPackages(extraLuaPackages); + luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; # as expected by packdir packpathDirs.myNeovimPackages = myVimPackage; @@ -101,13 +100,13 @@ let "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) ]; - manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; + manifestRc = vimUtils.vimrcContent { customRC = ""; }; # we call vimrcContent without 'packages' to avoid the init.vim generation - neovimRcContent = vimUtils.vimrcContent ({ + neovimRcContent = vimUtils.vimrcContent { beforePlugins = ""; customRC = lib.concatStringsSep "\n" (pluginRC ++ [customRC]); packages = null; - }); + }; in builtins.removeAttrs args ["plugins"] // { @@ -225,8 +224,25 @@ let } // grammar.meta; } '' - mkdir -p $out/parser - ln -s ${grammar}/parser $out/parser/${name}.so + mkdir -p "$out/parser" + ln -s "${grammar}/parser" "$out/parser/${name}.so" + + mkdir -p "$out/queries/${name}" + if [ -d "${grammar}/queries/${name}" ]; then + echo "moving queries from neovim queries dir" + for file in "${grammar}/queries/${name}"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + if [ -d "${grammar}/queries" ]; then + echo "moving queries from standard queries dir" + for file in "${grammar}/queries/"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + echo "missing queries for ${name}" + fi + fi ''); in diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 298f1c2f135e4..10e6a04498ab5 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -10,7 +10,7 @@ , aspellDicts # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries # available. -, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] +, enchantAspellDicts ? with aspellDicts; [ en en-computers ] }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 5c436307897f4..cca5d06ba90ad 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,8 +1,6 @@ { lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let - macvim = callPackage ./macvim.nix { inherit stdenv; }; - makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } @@ -62,5 +60,4 @@ let override = f: makeCustomizable (macvim.override f); overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f); }; -in - makeCustomizable macvim +in { inherit makeCustomizable; } diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 64aa5b639a9b4..bd526b8f6ce22 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -6,15 +6,23 @@ , gettext , pkg-config , cscope -, ruby +, ruby_3_2 , tcl -, perl +, perl536 , luajit , darwin , libiconv , python3 }: +# Try to match MacVim's documented script interface compatibility +let + # Perl 5.30 - closest we get is 5.36. 5.38 is currently failing + perl = perl536; + # Ruby 3.2 + ruby = ruby_3_2; +in + let # Building requires a few system tools to be in PATH. # Some of these we could patch into the relevant source files (such as xcodebuild and @@ -26,16 +34,16 @@ let ''; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "macvim"; - version = "8.2.3455"; + version = "178"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-172"; - sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; + rev = "release-${finalAttrs.version}"; + hash = "sha256-JYh5fyaYuME/Lk67vrf1hYOIcAkEbwtslcnI9KRzHa8="; }; enableParallelBuilding = true; @@ -48,26 +56,26 @@ stdenv.mkDerivation { patches = [ ./macvim.patch ]; configureFlags = [ - "--enable-cscope" - "--enable-fail-if-missing" - "--with-features=huge" - "--enable-gui=macvim" - "--enable-multibyte" - "--enable-nls" - "--enable-luainterp=dynamic" - "--enable-python3interp=dynamic" - "--enable-perlinterp=dynamic" - "--enable-rubyinterp=dynamic" - "--enable-tclinterp=yes" - "--without-local-dir" - "--with-luajit" - "--with-lua-prefix=${luajit}" - "--with-python3-command=${python3}/bin/python3" - "--with-ruby-command=${ruby}/bin/ruby" - "--with-tclsh=${tcl}/bin/tclsh" - "--with-tlib=ncurses" - "--with-compiledby=Nix" - "--disable-sparkle" + "--enable-cscope" + "--enable-fail-if-missing" + "--with-features=huge" + "--enable-gui=macvim" + "--enable-multibyte" + "--enable-nls" + "--enable-luainterp=dynamic" + "--enable-python3interp=dynamic" + "--enable-perlinterp=dynamic" + "--enable-rubyinterp=dynamic" + "--enable-tclinterp=yes" + "--without-local-dir" + "--with-luajit" + "--with-lua-prefix=${luajit}" + "--with-python3-command=${python3}/bin/python3" + "--with-ruby-command=${ruby}/bin/ruby" + "--with-tclsh=${tcl}/bin/tclsh" + "--with-tlib=ncurses" + "--with-compiledby=Nix" + "--disable-sparkle" ]; # Remove references to Sparkle.framework from the project. @@ -78,37 +86,45 @@ stdenv.mkDerivation { sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj ''; - # This is unfortunate, but we need to use the same compiler as Xcode, - # but Xcode doesn't provide a way to configure the compiler. - preConfigure = '' - CC=/usr/bin/clang - - DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer - configureFlagsArray+=( - --with-developer-dir="$DEV_DIR" - LDFLAGS="-L${ncurses}/lib" - CPPFLAGS="-isystem ${ncurses.dev}/include" - CFLAGS="-Wno-error=implicit-function-declaration" - ) - '' - # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it - # passes arguments to ld that it meant for clang. - + '' - unset LD - '' - # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use - # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath - # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim - # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default - # behavior to build the first target in the project. Experimentally, there seems to be a scheme - # called MacVim, so we'll explicitly select that. We also need to specify the configuration too - # as the scheme seems to have the wrong default. - + '' - configureFlagsArray+=( - XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" - --with-xcodecfg="Release" - ) - '' + # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a + # way to configure the compiler. We also need to pull in lib/include paths for some of our build + # inputs since we don't have cc-wrapper to do that for us. + preConfigure = + let + # ideally we'd recurse, but we don't need that right now + inputs = [ ncurses ] ++ perl.propagatedBuildInputs; + ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs; + cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs; + in + '' + CC=/usr/bin/clang + + DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer + configureFlagsArray+=( + --with-developer-dir="$DEV_DIR" + LDFLAGS=${lib.escapeShellArg ldflags} + CPPFLAGS=${lib.escapeShellArg cppflags} + CFLAGS="-Wno-error=implicit-function-declaration" + ) + '' + # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it + # passes arguments to ld that it meant for clang. + + '' + unset LD + '' + # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use + # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath + # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim + # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default + # behavior to build the first target in the project. Experimentally, there seems to be a scheme + # called MacVim, so we'll explicitly select that. We also need to specify the configuration too + # as the scheme seems to have the wrong default. + + '' + configureFlagsArray+=( + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" + --with-xcodecfg="Release" + ) + '' ; # Because we're building with system clang, this means we're building against Xcode's SDK and @@ -124,7 +140,7 @@ stdenv.mkDerivation { # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' substituteInPlace src/auto/config.mk \ - --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" \ + --replace "PERL_CFLAGS${"\t"}=" "PERL_CFLAGS${"\t"}= -I${darwin.libutil}/include" \ --replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ @@ -143,17 +159,25 @@ stdenv.mkDerivation { substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope ''; + # Note that $out/MacVim.app has a misnamed set of binaries in the Contents/bin folder (the V is + # capitalized) and is missing a bunch of them. This is why we're grabbing the version from the + # build folder. postInstall = '' mkdir -p $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications rm -rf $out/MacVim.app - rm $out/bin/* - - cp src/vimtutor $out/bin - for prog in mvim ex vi vim vimdiff view rvim rvimdiff rview; do + mkdir -p $out/bin + for prog in ex vi {,g,m,r}vi{m,mdiff,ew}; do ln -s $out/Applications/MacVim.app/Contents/bin/mvim $out/bin/$prog done + for prog in {,g}vimtutor xxd; do + ln -s $out/Applications/MacVim.app/Contents/bin/$prog $out/bin/$prog + done + ln -s $out/Applications/MacVim.app/Contents/bin/gvimtutor $out/bin/mvimtutor + + mkdir -p $out/share + ln -s $out/Applications/MacVim.app/Contents/man $out/share/man # Fix rpaths exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" @@ -165,7 +189,7 @@ stdenv.mkDerivation { install_name_tool -add_rpath ${ruby}/lib $exe # Remove manpages from tools we aren't providing - find $out/share/man \( -name eVim.1 -or -name xxd.1 \) -delete + find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete ''; # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and @@ -179,10 +203,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Vim - the text editor - for macOS"; - homepage = "https://github.com/macvim-dev/macvim"; + homepage = "https://macvim.org/"; license = licenses.vim; - maintainers = with maintainers; [ lilyball ]; - platforms = platforms.darwin; + maintainers = with maintainers; [ ]; + platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; -} +}) diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 6af3e384a63c1..223778acf60cc 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,50 +1,60 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index 32c89b387..c2af70127 100644 +index 162af04..4322049 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -9,35 +9,5 @@ set nocompatible +@@ -9,45 +9,7 @@ set nocompatible " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. set backspace+=indent,eol,start -" Python2 --" MacVim is configured by default to use the pre-installed System python2 --" version. However, following code tries to find a Homebrew, MacPorts or --" an installation from python.org: +-" MacVim is configured by default in the binary release to use the +-" pre-installed System python2 version. However, following code tries to +-" find a Homebrew, MacPorts or an installation from python.org: -if exists("&pythondll") && exists("&pythonhome") +- " Homebrew python 2.7 - if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python") -- " Homebrew python 2.7 - set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python +- +- " MacPorts python 2.7 - elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " MacPorts python 2.7 - set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python +- +- " https://www.python.org/downloads/mac-osx/ - elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python") -- " https://www.python.org/downloads/mac-osx/ - set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python - endif -endif - -" Python3 --" MacVim is configured by default to use Homebrew python3 version --" If this cannot be found, following code tries to find a MacPorts --" or an installation from python.org: +-" MacVim is configured by default in the binary release to set +-" pythonthreedll to Homebrew python3. If it cannot be found, the following +-" code tries to find Python3 from other popular locations. Note that we are +-" using "Current" for the version, because Vim supports the stable ABI and +-" therefore any new version of Python3 will work. -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " MacPorts python 3.9 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") -- " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python +- " MacPorts python +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python +- +- " macOS default Python, installed by 'xcode-select --install' +- elseif filereadable("/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3") +- set pythonthreedll=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3 +- +- " https://www.python.org/downloads/mac-osx/ +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/Current/Python") +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/Current/Python - endif -endif -- +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ + + " vim: sw=2 ts=2 et diff --git a/src/Makefile b/src/Makefile -index c4a3ada37..06ee3de44 100644 +index 5b4cdff..72fee3a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1290,7 +1290,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -54,10 +64,10 @@ index c4a3ada37..06ee3de44 100644 MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 39ef81449..d8fa7ec2f 100755 +index ecf10c4..4b691d0 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } +@@ -6247,10 +6247,7 @@ printf "%s\n" "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +79,7 @@ index 39ef81449..d8fa7ec2f 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6646,23 +6643,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +103,7 @@ index 39ef81449..d8fa7ec2f 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6526,13 +6506,6 @@ __: +@@ -6902,13 +6882,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,10 +114,11 @@ index 39ef81449..d8fa7ec2f 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else ++ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6547,7 +6520,6 @@ eof +@@ -6923,7 +6897,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -115,8 +126,8 @@ index 39ef81449..d8fa7ec2f 100755 fi -@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ - $as_echo "no" >&6; } +@@ -7004,13 +6977,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ + printf "%s\n" "no" >&6; } fi - if test -n "$MACSDK"; then @@ -126,13 +137,13 @@ index 39ef81449..d8fa7ec2f 100755 - PYTHON_GETPATH_CFLAGS= - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 - $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 + printf %s "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -8060,11 +8026,7 @@ printf "%s\n" "$tclver - OK" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 - $as_echo_n "checking for location of Tcl include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 + printf %s "checking for location of Tcl include... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" - else @@ -141,10 +152,10 @@ index 39ef81449..d8fa7ec2f 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7579,13 +7540,8 @@ $as_echo "<not found>" >&6; } +@@ -8082,13 +8044,8 @@ printf "%s\n" "<not found>" >&6; } if test -z "$SKIP_TCL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 - $as_echo_n "checking for location of tclConfig.sh script... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 + printf %s "checking for location of tclConfig.sh script... " >&6; } - if test "x$MACOS_X" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" @@ -154,8 +165,8 @@ index 39ef81449..d8fa7ec2f 100755 - fi for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +@@ -8285,10 +8242,6 @@ printf "%s\n" "$rubyhdrdir" >&6; } rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" @@ -167,10 +178,10 @@ index 39ef81449..d8fa7ec2f 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index 4ff59f201..f91cb9836 100644 +index 6e33142..6185f45 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -244,17 +244,6 @@ +@@ -270,17 +270,6 @@ # define SUN_SYSTEM #endif @@ -189,10 +200,10 @@ index 4ff59f201..f91cb9836 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 3b154f288..e89f26060 100755 +index 3b154f2..e89f260 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" +@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" if test "$1" = "-g"; then # Try to use the GUI version of Vim if possible, it will fall back # on Vim if Gvim is not installed. @@ -200,3 +211,4 @@ index 3b154f288..e89f26060 100755 + seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" shift fi + diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index d679dfed6db4c..60a28dd327dbb 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -12,7 +12,7 @@ "new": "vim-fern" }, "gina-vim": { - "date": "2024-06-19", + "date": "2024-07-03", "new": "vim-gina" }, "gist-vim": { @@ -60,7 +60,7 @@ "new": "vim-suda" }, "vim-fsharp": { - "date": "2024-06-19", + "date": "2024-07-03", "new": "zarchive-vim-fsharp" }, "vim-jade": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 213806b2f402a..ff7285bd1aa7e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-03-06"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "df53728e05129278d6ea26271ec086aa013bed90"; - sha256 = "0yh7awf26cqfndhliizi0mfqj2111hicg3hlqjjiag96qq9csgdw"; + rev = "f081338f07216a46d3915ce46c1fcb083bcb5016"; + sha256 = "1hgwdahp5h2nfzwfgjjgdbki5jnyg5gmapvz1kd1zmcycslb85di"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-06-15"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a36352930b5e5f8d33dda09eef0c9d7c96190a02"; - sha256 = "07vy515qgfc6f1y96dn0ykm0kh3ylkhf6igb23f4jv608ylz4f12"; + rev = "c1dc30666c957815b012ae67e8e61de6b48ecf86"; + sha256 = "17hrsjxyr9f59h790gvwk8gmp7zzfjjsnvb5a5lpqa0q4yxq3fzv"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "67eece6d74f071035ca7b934a753d71d1677dd9b"; - sha256 = "15r8n3ch609lifv8lvyis5kn663c6jjj4zkzhyn4v4cxcxj3lb5d"; + rev = "1f603f9074118ee9975b2af0308452ca324640e5"; + sha256 = "0p9rrhlxa1dy5ym85jhr8zxai7zng0sikf5v0ywdi09vryknygxb"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "11c08af2ae56fac83772d21aa5133913784ca2c4"; - sha256 = "1yld7h2s1yr5l65iagk51xx4znf1vh5m7c5c4gmmp5zr2px0bn8b"; + rev = "ea67d004f86ac10e29708fbb4de84f72b87df612"; + sha256 = "15pdsx91cbl4ig7ph5nbrqm42l08wbs9dvn2d80p922ywm4vjxdq"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -267,6 +267,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; + Preview-nvim = buildVimPlugin { + pname = "Preview.nvim"; + version = "2024-06-01"; + src = fetchFromGitHub { + owner = "henriklovhaug"; + repo = "Preview.nvim"; + rev = "388882f3bfd09bcb0d5b4ab3d0fa5bc2dacbbc2e"; + sha256 = "sha256-Tnl2TkLY9QXk/5qX2LcX5G2aq/sysH6BnD2YqXlneIU="; + }; + meta.homepage = "https://github.com/henriklovhaug/Preview.nvim/"; + }; + QFEnter = buildVimPlugin { pname = "QFEnter"; version = "2024-05-05"; @@ -317,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "35f36c50b9f1e1e916d0e3f004cb48dffd2bf737"; - sha256 = "0a3488c74hrykcmharzza5svy9c0smw9yzafpdsgw10adav2mxqb"; + rev = "b606847df9f91ab6a7d0484c2e3fae096c9fe028"; + sha256 = "13whydyh7wrw0wfpbx9sn330nybbggcks5866fqpx05zdkcv1kfc"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -389,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-06-02"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "af055c0c73e4d49c57acbb40d9f6e248f2a38d52"; - sha256 = "1ngh7m1mkam8vavpzgym3nii25ivw2b557hj72mi2j1f18xgvf90"; + rev = "e2250a99f7c3c0247d7e7456ee1bceb17aee1927"; + sha256 = "13152c34vzxpag8k6r3z0sk2mh1nyl3v76l893iwdi3q9hw8r9wr"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -461,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-03-20"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4556062839aa2e86f2f4f1c0b4532697d607af23"; - sha256 = "14391a213340agjafvraw1az21vj940y7ddwqwbbsrj4q18si7av"; + rev = "b5fe27bb82cc375d66a9a006cf30390bdb215ed2"; + sha256 = "1fm8dbdr26zknxcyiah7jz1v0h9cx0g4dg9c9vrm3w3ibbpy2jf0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -534,12 +546,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-06-17"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "eb25396dae306cef5b8fffbe9ae98283d2f1c199"; - sha256 = "1byzkpcc77a2zwlypgmcmzik816i4qcaydb8ssy0vxrf3nsjx9s4"; + rev = "db0af491ff13c18a966ce2f9ac7f5211aec000a7"; + sha256 = "0v0064c0prsxm7z151nd7fvfwq6na5agbh3dqnj9whnwx0k0l2zl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -595,12 +607,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-06-02"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c7c41e157478fc9d4f65e9f640bfce75fa211fd7"; - sha256 = "1g7q3nc0y0k1hwg22mqcwypsriss6q12bx1d653sg5jsm7l8lrck"; + rev = "a35fa4d732220914d620deccbc8ef68fa1bff96f"; + sha256 = "17afk45cs61zvk01kg9brl86k4czgfvsrg87zdaszw2abhxrqgi4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -823,12 +835,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-05-22"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "182c636909cfd41e1d72e1278a7db6a4e5271b81"; - sha256 = "0mbr0abpwj45bnc3riv3mgfj9ic3xjbxkgwmkzjrr42zw208rki5"; + rev = "b0987750dddf0ee678d160fe50e3d5397cd0c9e9"; + sha256 = "0ifnfif65ykpkavaajwiqc8pi38c0x7b709kx1gvn0z7nr8gxf7p"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -919,12 +931,12 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-05-21"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "af2219b9fa99c1d7ac409bd9eac094c459d3f52d"; - sha256 = "16qs3xqlfcdcrd9phyf180hhcp28cc4z2lsg68zr3jhdlyls6yxj"; + rev = "7b1b30d3424b7ca0fb4d12ce3f3d1977cf7c5691"; + sha256 = "0dqq4na08bcpw2668ykcih5rw83k3a138x3a6q9i26wzmviyvkq5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -1040,12 +1052,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-06-18"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "a1b2661f3cb248ae4fafc0cc50ca2588532e231d"; - sha256 = "0f004i98g6jvgnl561bmhzga09gdh1nizk95ahyyg6y5bkqkbrn8"; + rev = "b67ea789efd5e81692c802d2b42629db79683da1"; + sha256 = "0j16j20psjqgl4jmzh3ajrz5zzz85fs0nyg5gyp247cka5zljhr9"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1100,12 +1112,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-06-02"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "87e09eb9e959966397bd9d8aab18d88ef349c913"; - sha256 = "1j2hm9400dlynkzxyxqzp4rz4kxjai5hiqv4b3lxg21g49lq5aa6"; + rev = "d4ffecc3e1a34f3ed9af6362529552eee79e57c2"; + sha256 = "11k0slasxzyj1xifvlj6fy1kajnlvk5kyv05f70c7k9a3kn79jpx"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1304,12 +1316,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-05-24"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe"; - sha256 = "00rvijzj17449zmsiqwp8ybcsdd84frny3kl3b7wm57bbiis9w7h"; + rev = "81820cac7c85e51e4cf179f8a66d13dbf7b032d9"; + sha256 = "1z4i45gnh71ayqxkibd7zb07k1k9y0mk6pnldbmv73nhwi9m2ypw"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1376,12 +1388,12 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-06-03"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "22924b7bde685e1816140f17a897950ef82b969a"; - sha256 = "18np41as7j6axbfl5l1cv5b0xpsslfj6pcc8ih1sax4awnfbpf46"; + rev = "4fb5abaef2f2e0540fe22d4d74a9841205fff9e4"; + sha256 = "00916cwvdg3rccmf4vg811gi03gpdrpsndpr9ady29dii2alb6pb"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1436,12 +1448,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "513154670f9e174e0b5dc75dd0662c5da493c284"; - sha256 = "0apnz8qmj0173dw4nnxj3zjr5695f20za599pwlmfrld0nfgaqc2"; + rev = "b6c406e2b941abbb334388d6d3e82a737e47ae11"; + sha256 = "0lw2q6hjc6yd8p6afkswp40lgg4i5agjyj161mp05lvdp06jb05x"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1460,12 +1472,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-05-28"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "665de14b9a61067a706a53c233e67126f7edf53e"; - sha256 = "11v9jxk4wln7i542mjswh964dsy8isanzhpy2px4pqnwaxq58cy7"; + rev = "cced9374c8b15eb466d67ce1c56e854abd1f0d46"; + sha256 = "1gfxnc22warpbxw6qykrc3850k3ij1zyrhx85ln57kzhsngamy5x"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1544,24 +1556,24 @@ final: prev: close-buffers-vim = buildVimPlugin { pname = "close-buffers.vim"; - version = "2020-09-23"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "asheq"; repo = "close-buffers.vim"; - rev = "0b29fbc483344e2ebec96a28070698d72a8a767c"; - sha256 = "08pqnal5zfspg1wmg6laf9k46xrh3cg0yzdhl853j3ys96mfk8pf"; + rev = "a679b99cee5f3349a83f95f8200e7c1fe6603b13"; + sha256 = "1jdxh28kirhw1m5gj48skhffn03g49qw92vmr3fahk5dfqh4cyi5"; }; meta.homepage = "https://github.com/asheq/close-buffers.vim/"; }; cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-06-11"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "09bd61415ecdba84f378fe734680f69375260985"; - sha256 = "1ygqn0qwmgq19c46aadrqb7kysmwh5igrdj5jwy79zc6f20zh3b7"; + rev = "4be3c229fe932043fd83ad52fdf0ba9af7297789"; + sha256 = "12cyls7vsz852b2x8vhs7qwi20kcml4z7zc5b6zaamw2h74an6sm"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1723,12 +1735,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-03-03"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "3dab73d34a889eafdb57c666c3c2076b4c3e126b"; - sha256 = "08nyng2ykxnapih97m1wsj1fskjz7yb09g2mb3428l7zbvjjk3nq"; + rev = "e6e3ec979b586a75c53e72f2d6a035f28bb3979c"; + sha256 = "1nz0ywakqvvscrvdzk86w8f29s8mrcyln2jqgh24kvic5zwb66xj"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -2291,12 +2303,24 @@ final: prev: src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "625a5cf79443a532c81f9290b3344ed8f91d2e20"; - sha256 = "1i2l9ss9i39zdxmfzrpvwsp6lx49ly7synrr2bm6byywmpx1cp37"; + rev = "7a01ffb1e6538fe634f294908a50a7b680039284"; + sha256 = "196a66my0jy4166irhwg908dayqc2pv0yiwqgsisi8srzybacm6f"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; + codesnap-nvim = buildVimPlugin { + pname = "codesnap.nvim"; + version = "2024-05-08"; + src = fetchFromGitHub { + owner = "mistricky"; + repo = "codesnap.nvim"; + rev = "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b"; + sha256 = "1j1qw9wr2ymwj75k3yhby2fcq81b68yxp4wvd16xnq3ivyg74r3l"; + }; + meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; + }; + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; version = "2024-06-05"; @@ -2467,12 +2491,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-06-14"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "520ca6e0bd924e3ca8bd26e036a3b830955cf52f"; - sha256 = "18086w0hawhf94xzbgrk2h5qsnxx58w9193v5ldwmx55l7dn9i16"; + rev = "4ad0395994f374e6c797266ea4acca90927f19aa"; + sha256 = "1fj2n5p335as4cdrn0msi8a4dmzwdcplwlka8hra2p1avrnv8lw7"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2551,12 +2575,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "bde3bee1773c96212b6c49f009e05174f932c23a"; - sha256 = "083a6glk20zj1rxnajchi6v6mah9632qmbzrs270lmjplk6dc2qk"; + rev = "cd75be867f2331b22905f47d28c0c270a69466aa"; + sha256 = "0lck0dzrisb3p4gw1qfyh4874nfj74ariw274s6nzqz39bk8nmqq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2564,12 +2588,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-05-31"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "934687860a71d1d03e569ce11f880a4d404e69aa"; - sha256 = "1j0rsyw37wc0sh3im1m20akriyj0fmwlhbwfpkzav25wk9c8kmf2"; + rev = "a81977726f726b21d4bd75cea5bbbb7022005507"; + sha256 = "154bkh2cxar7ajyi8y4ym6ckp48b333cml73a52g6qfiggql5r33"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2624,12 +2648,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-06-14"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "88d08cf54f623341adde4b18362bffc95174dcd5"; - sha256 = "1ih8f8bbivywlaj54jaxnz6i05770qss028fafqsvn3h9cindigi"; + rev = "0668308e68b0ac28b332b204b469fbe04601536a"; + sha256 = "0vhcdzhrkh3rs88kh481310z9ma775za1gf7nf8fq1x0znd2455w"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2672,12 +2696,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-06-11"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "83808cfdebca290c84808c85b73f4dbcf5cf981f"; - sha256 = "17l52gd96kfqq4nc0z8qprigvzzrbsa1vijx7kdvgr0qbw4mr5gy"; + rev = "6b35465a58052f06b5ee0ca63606439ea7c862e8"; + sha256 = "162xqsrdv9zpqhr723z5b4m1154ryvddbj5kyxsrwccgxj6q5irv"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2720,12 +2744,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "909d233a8a86fd5ca8ef9eb1e404e89b81e05c41"; - sha256 = "1gbksj75hpkxn5mvvqhyhwx9l2b5xrp2vgwplydxgp3ml4f66rv7"; + rev = "c3fd47391de6999f4c939af89494d08443f71916"; + sha256 = "0vw47mbx7pw4zzrj70yli86nk407j05ll1lq7d4nb41vii3lnlyb"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2816,24 +2840,24 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "db76342d8dff74b9382bf1e9c9e648ee16869809"; - sha256 = "1vzhylvw54jsz3fnmbx85if1izkmzzzbpzmdzw6dvmyqiw4axj7i"; + rev = "998e6562cea3f86af74c489eeaf005ae82657886"; + sha256 = "0azwqlw14ipailh6xdlvflzlc6d2r7gn0syba5rs3cd42pdgk01f"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; - version = "2023-07-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "928302ec931caf0dcf21835cca284ccd2b192f7b"; - sha256 = "0chfg23ckqyz5gr44arfvvs2b3h34n3d0jhmhfzaw4ylspxfx548"; + rev = "4bdc04e2540edf90fda2812434c11d19dc04bc8f"; + sha256 = "1ckrf37p22ap1h9ls48jr4qk4yrvf17ylzkjki4dbpzl4kzrylbi"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -2852,12 +2876,12 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-06-12"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "b88c997f468a1bacb1e9b13ff3b567638caa06e6"; - sha256 = "0q77lzd9ls62dc3fbzrc401aaxah2sh1p1g9zfsxvimb4y313b7c"; + rev = "e6e33b848f0e2fe5c13f6553c568764555c390a3"; + sha256 = "14nhv9jx0f92gp49bymr5wfnsvwkfllsmb8ax9nbvj68i22baq14"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2972,24 +2996,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-06-18"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "c6fa7c615ea7209ece65b2322591f0dd0167358d"; - sha256 = "1qxnk06sxrs1i5rhraiid9v6jr2nw5psgj8f0n42jfbpiadb6m2h"; + rev = "09e64956c2946bba0a060d0a0aaddde106753bd9"; + sha256 = "128z109hixhbn50aqgcdihdjc0i94sgqm95l8ra81cskhz1y00cc"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "7fe1a74a1e9abba978e3a1e02f798bf04de71a5f"; - sha256 = "0s61cwhjacnj5rvg87l263pf8rrla6ym8z89pp43wqj875d8d8s5"; + rev = "dc1efcf37e8c415ca686a4b6faaeae801ffc7ab4"; + sha256 = "1pvqxbyiccq5y9m0v23prkfi5b5p09xbn6ygckv7ppi7gb63hr2k"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3262,12 +3286,12 @@ final: prev: dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2024-05-18"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "7af2daaaf933b0617ded0f78b49f4d5fc45f9f64"; - sha256 = "131h6qpnzdgq72z4wkf3pm1xm848iyhbkim3689l0x950z1f56n1"; + rev = "750f802879c90ea51f92b68c35fa562ee575804a"; + sha256 = "0zcg3lyxjib9323dwilplgycxx0gcakfncficf3niw76j7zqgw9c"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3394,12 +3418,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2153187e3ca56c11a7f35852bbaef6525c936b1c"; - sha256 = "17bjyn241iy7qflw8yqlzxi4536b9l6hnxcbgbxsj8a7s3f51iqd"; + rev = "95d2ccf1a962445eec8640a507b97ed10d7d865b"; + sha256 = "1islv5bd1x3s7l6x0gigi3xj9k28dz18riaakjhm0sl4p70hxc3v"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3552,12 +3576,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-06-02"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "9dbd4d1c3255ed801e515f2ed388f4c6ceb62f6e"; - sha256 = "1ccawa3m5crqgwz30bm6pz6rdjdnqkp6w724qrbq5d053gss42jq"; + rev = "752a026157f5befaf705bccbcb2ddb5b67703e03"; + sha256 = "0715aaryz76dl9sqsfd8kyz7nwk0g803h6pxnnhlxzpigq9fcs8m"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3720,12 +3744,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-06-06"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001"; - sha256 = "1prrmc41221f334b1cxhc7msxz5a83m0k7hg2hzspszggfgv49vh"; + rev = "c6e37476ab3b58cf01ababfe80ec9335798e70e5"; + sha256 = "0mcfm4ya7kwr6yj0wfwylqqhiv9hx7m45dpfsra7zzjs2xjpcplq"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3841,12 +3865,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-05-19"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "990a1349c29f7d474a0cd51355aba773ccc9deea"; - sha256 = "1qn6b6hmyscxiczwp1k530l1k165wlnqxjk820737d27l451c5vm"; + rev = "5aa227fa083fd740184b55b5220dfabc24a25cc7"; + sha256 = "0ga9ipycmklxcbqz8pnan1sli49qwc8wx034drmrvfpbriw3bc73"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3997,12 +4021,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-06-19"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "c56717d6833166adadd11cad05d979b1fb370c57"; - sha256 = "17cwiv25qg3lvlm6j5v95pdxd92470kb1495xvp2iaanzzmkl1h8"; + rev = "3b91c1a471160bd8620bdca8f18743d954994daa"; + sha256 = "1qapr7nhp8kz9dzkzkkqzlsv51qdkdv5zr457pgnf7rpk3bnf4yj"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4105,12 +4129,12 @@ final: prev: git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2024-06-03"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "bfd9fe6fba9a161fc199771d85996236a0d0faad"; - sha256 = "1lwxnfa6scw64pxq1viqrbdcsn2gf8hysqkbnn66y5518b5rc5z4"; + rev = "45cde6f0acf26d0e4b64acfa45349dd1da01e577"; + sha256 = "10gsqny5wbqyz7grvnn4c02wib06b4594rffa8bmdydvg09fb9j9"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -4189,12 +4213,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-06-19"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "651d5ed082605f3ed96b0f037a768ca06ecf8fc3"; - sha256 = "0fllibgmp1sfargpkswg1h3kg667y0sdazc0z5midaq8skr9crz6"; + rev = "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7"; + sha256 = "1xaxi3v67wdrgyclcrimcpfd1ggfb0wxxy2iz9xmqlkvc3g3aws1"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4249,12 +4273,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-06-19"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "78c6d7b970a79c34dc0f35149f4bd845e09803d6"; - sha256 = "0pg14jml1n27imy4rdb1ri7wi7bnh2fp8q7rah5az8k80g26ghpg"; + rev = "cde0c7a110c0f65b9e4e6baf342654268efff371"; + sha256 = "0xmyy4wahgi097ay7bs091q9d7ysvknargnlcg8l7qsq6wipl4d9"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4297,12 +4321,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2024-04-05"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "3552fad4a0244ffd9ac86508e29ccc5166f19eb8"; - sha256 = "1a7dbzr3sgabcidwls7mnjbdbhjqayh1xfxwhl96ml3cqhari2k7"; + rev = "1519ea3512828c944eed5b2bbb66a8f8deb92447"; + sha256 = "1ql68yzm33jqjh2argad8zgl012sg4s7xzidazmrhl4ins6y492g"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -4405,12 +4429,12 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "905a41c86dbfed42f89c13c36f0e3407e9318910"; - sha256 = "150lr7imib2wk3pjlp6jx0w2vz005q89f7r0vnvpw1gh2f6rjl5q"; + rev = "23371661bac2b7fdd9769c685e4224990c3b9ab8"; + sha256 = "0f0kpwzl614zwbrc6rc8x5cl54dhdlngg41xr19wzcklnqzbl0w1"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -4429,24 +4453,24 @@ final: prev: gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-06-05"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "d4cde3853a172485961b515c36d51d757728d6e6"; - sha256 = "0aqz3gybdl1sj92p53md63pwgfs1d60k8vjc0x69wqya81dl7cn3"; + rev = "fa8138d25c061b9cbfacdd3f4dd1929e2a6d92ce"; + sha256 = "007i6gkbapyn2fv19yr5izfsv859qw4qnbdxfp7kv0sidkqdk47p"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-06-06"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "c1651e33a450279b76e6aa70d131472201ef930d"; - sha256 = "1axnx1wa32mh5s2vzhhc5y1471053y5ml9gnvmiiqax94m7acvzp"; + rev = "de6587e99371aeb92cfda3415b6a696c1f55d397"; + sha256 = "0fqynfal7vk55mh13p5v5gh3fhpf26a7kajyrl79hdsr9shv5s4g"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; @@ -4501,12 +4525,12 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-06-14"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9d5b241261904ae22429877c1459e7c632dba736"; - sha256 = "1xb93g4cxy3w4jjagaqmyvf2qfii4fm5biriadkmf4a08vdxg682"; + rev = "9688bc77bf9e8e2ad97cf0f9b7701407aa2b31c2"; + sha256 = "1paddg7v3akc4s2l1br4gfwvbg1gxzgajaqman3fi56pl7lw5xy1"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; @@ -4548,36 +4572,36 @@ final: prev: haskell-scope-highlighting-nvim = buildVimPlugin { pname = "haskell-scope-highlighting.nvim"; - version = "2024-05-23"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "kiyoon"; repo = "haskell-scope-highlighting.nvim"; - rev = "8d882e6710865217394cf1cad5fc9e2becd6d6f6"; - sha256 = "1a7mnb8a0a4v3gyw7padwbqchxmjnygbvvr5m2cixlmb01ahs9ap"; + rev = "9f0f9ee26a011c3567865cdcc0443318de281ad3"; + sha256 = "1npaanvvgnqpra4wbnxjffjdvw3mks8si42pnl5pj5snascbigv5"; }; meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/"; }; haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-05-20"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "46462fe142521bd5719412dc9d740c2e54a9186e"; - sha256 = "14cqvs09yk1b9dk8k0l322kxqahr5hzv7iiz72pjfjjk888dhdr2"; + rev = "e430927cb222718e14ac32116011b5e3df39ab51"; + sha256 = "1drsis1521x31r389j9d2gxcclbc9cfg6f0w3qgbz7yd4cyxmxnm"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-06-16"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "0223bf4b47ab517030f406617c153e7d1e4a7811"; - sha256 = "1ab3s6lrqh870qcphxjsvj5q8jg7lxv27119r5qyp60rf657q39a"; + rev = "239875d842ca25d4eb7dccac574ab9a5f5271c34"; + sha256 = "1w5m248lg7c3hnm4mdrchkhxr5ack76x3dp3p4m1vgix9gl8hbl9"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4859,12 +4883,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-06-16"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "bdd5506be7fb39668692e30141f1637b691379af"; - sha256 = "0dfvg393l0rwr8lm25fkw8gh1vx592jc1ccslal81jvyjnvgc237"; + rev = "7d021c94e231d491355f5e724ba357ace296f06d"; + sha256 = "1fjh1w07lwngyxa7aqxbxw6x0npz6x1zb7k73q8zihrkz0xrhcln"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4943,12 +4967,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-05-23"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "d98f537c3492e87b6dc6c2e3f66ac517528f406f"; - sha256 = "0zb52msar7hl38xmi3pvjsynjabqyv2rsajrzdx46wqp018v971b"; + rev = "65e20ab94a26d0e14acac5049b8641336819dfc7"; + sha256 = "14v9mglm2zykylga0lzh9w1vcmxixya7xg2k4z4m6f4a3l21farx"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5136,12 +5160,12 @@ final: prev: jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2020-06-18"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "51b8a2a504416c4959127c82eac26f14f3508975"; - sha256 = "15ax7v6crdzra4sqqmjpvl9q1p9dmsksrs4j68zqqrj6kka0zkgn"; + rev = "ca97dafc82c012b3a9005a12a673d2cfa854376d"; + sha256 = "14g85r90860a4n7ggh29s1k6brgcyycm4j1ll4y7h872v8d5265p"; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; @@ -5209,12 +5233,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-06-12"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2"; - sha256 = "1ip8f9i822d6mmaxvzrvap19k5lr9mp8k6lgh2xyspszbgxi0nhg"; + rev = "e5f7b8a804360f0a48e40d0083a97193ee4fcc87"; + sha256 = "1066495w73a11kdpm8iah3k0pjf766ylf21jk8gjid73byl2lz0n"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5317,36 +5341,36 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-05-01"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "17deb64279389056b6edd4b0619d8dc391798b6a"; - sha256 = "0lzihyajpjmj8g0jqbm5mgdkafbpc061bwjrsryswvgan1j5y5bv"; + rev = "3ce514080931ca6c35036dd9f90da879e9ab3204"; + sha256 = "1jfkvhlr70d8c6m413r74q4qi1kwk9ll5n48scrqk4fvpsgx8777"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-06-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "bc620783663ab09d16bff9fdecc07da65b2a1528"; - sha256 = "180rvpy9bv7c7gnimhwgzyxr2hml9v371ki8n73v726ssk4x1pzc"; + rev = "d0921f5b9b3d2c5e09618da55a018228edcc4d16"; + sha256 = "1yl852zim52mrj4ddc30pfgyrp58wjkfcvmiyncqgj1nsibhdnxz"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-06-15"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "6184ebbbc8045d70077659b7d30c705a588dc62f"; - sha256 = "1kj3p5x7h8k1xp8m5pxjkzbfigcbrschgm1kzlc3qkv0py3i5k5h"; + rev = "78d8a11fbd02ad4eafa07dd8a43a959a69fb3bf8"; + sha256 = "04qdq0wz0qz0p2khm6jdzxy70pdya9dfjc9ij4liphxjc3pf0c9y"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5365,12 +5389,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-06-10"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "3c0b48374146abd651da5623f3f73f96121a616f"; - sha256 = "145hpcg64pxxfqhryzs88q0yyw163a892npsra6rbdnca1jzlr8z"; + rev = "a46a28499bae49f5f0e99d04134ba4617a213304"; + sha256 = "00621vmbyvrgqpwlshmndnmflggb9jhislqqlmps8amqryq57y5w"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5401,24 +5425,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-06-18"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "2ec33f2a38974fe6997c42c5ce61ce84eab84cc8"; - sha256 = "0xavag2c5mq5ii14b5dvm7nm13cs97nhag28gpvjdzwgkzz3c21v"; + rev = "eca8108dcd5f41fbde2a674dceb58b81ed887dc8"; + sha256 = "02sgp1lv4s7szqw2awsaavlhvji8jn24g8hzj7d56y6hjl6pz1id"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-06-14"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "89e0d00c5aed623c1f29cf2a963fd1737358e92a"; - sha256 = "0i4xh66xydssvr4n2kknrg1qibj8ikfvy5m6ljbmhbvgxim74y48"; + rev = "847af406e688e172934ec91ba12088ffcd497e1f"; + sha256 = "1grp39x69i6yqmcflnwxj74knsv5pdxfa096sxn7h458nbdm3pma"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5473,12 +5497,12 @@ final: prev: lh-brackets = buildVimPlugin { pname = "lh-brackets"; - version = "2024-02-08"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "4899ead266d99e0b9749b9e44f6a33ea83384a7d"; - sha256 = "0bg8p4g0v3y7sikcwb1g2n3kr4rcafskg1if6gh1xnr1g0czbckw"; + rev = "e7852490097ed1bb2ea95fb08fd0fdc4d2a7ef20"; + sha256 = "1gg5hxss85bcsjrfqamiir571c8xqs03rqaiigfhbs7lhp2l7ffd"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; @@ -5725,12 +5749,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2024-05-26"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "78f4cf53ff72a234d7903c1d41872c8b21c6007b"; - sha256 = "03791qzm3qv2gw176bwki4dmizjy3myzdm2c62y4hjafx4y9mn8d"; + rev = "93e11c9a01f81daa4a5644e772a7a77f53dc270f"; + sha256 = "1765fwsqxa8w6rznrhhrmxbxk8mhwxh540sllj9rfkx1nh5lszg9"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5761,12 +5785,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-05-26"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08"; - sha256 = "1z39f3qagyhrm90hz4pilbqnbyncpxgzsx236yw9mdgfqni912ms"; + rev = "87701af045b3032515776abeb47eb8c2ddb5e679"; + sha256 = "0ik2q2jz4ldyql3z64zr5dyi8i6qja6xsczv966fkdmsckk7r1zh"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5880,12 +5904,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-06-07"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "50fcf17db7c75af80e6b6109acfbfb4504768780"; - sha256 = "0aa5imzbfz50d7vpmxixqjri147x7w7883p8qm6dp2m1ygijrx30"; + rev = "ce0a05ab4e2839e1c48d072c5236cce846a387bc"; + sha256 = "17q4b9hlnj7cnijw8xcn0g3fk8q3c8smz6l125hlwzlak23b716d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5929,12 +5953,12 @@ final: prev: lz-n = buildNeovimPlugin { pname = "lz.n"; - version = "2024-06-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lz.n"; - rev = "ed1dfca4c69ad84558bace90740b3ea2dd6ac842"; - sha256 = "122rx7khasj0liwrw07m4x7ysq86342b3q5fzg0gdkln7nn5pv4n"; + rev = "4c790ba2c3789f580aa019712bbe3112f85e73a0"; + sha256 = "0vwpfagpm7vik1cg4cwx0r00fqvbq2id8b78wzrr090xp2a2cz50"; }; meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; }; @@ -5977,12 +6001,12 @@ final: prev: markdown-nvim = buildVimPlugin { pname = "markdown.nvim"; - version = "2024-06-10"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "tadmccorkle"; repo = "markdown.nvim"; - rev = "d6dd17dd36fd8d83f5bf2fef6a9acc24ffa6ff9c"; - sha256 = "1i6ays4c4azx7fvfy4hm69psmafyvqf7q33a8692cj6q8zl5fvxd"; + rev = "dfa0d2def6dbf77e9206b16dc90cad4dd23d55d2"; + sha256 = "0p454caxkd8chg0v1m085vlmrmhkvhfwq625wgy9s8bzinja5rb0"; }; meta.homepage = "https://github.com/tadmccorkle/markdown.nvim/"; }; @@ -6061,12 +6085,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-06-15"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "173bde5eea25e73c5ece9448e19c3e30b5b21ae1"; - sha256 = "0smlnk3d5dv33ww1k96f7mbyy6xs3ma179f86kifv08k1wn7n4xq"; + rev = "b5d0ff3ad37ba00cea3dc3dce0b0f555b481c6f4"; + sha256 = "1vlv9n8hy7lcjz3xa48pry9by41pfjv73vyjinyj91bjs7x4ln7p"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -6109,12 +6133,12 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2024-05-29"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "b76b906cd6ed3c3152a47924a8eb5dcb35b326d8"; - sha256 = "0xy98wlbdljcf08wzl4hndwadmswb3a4jmf0ynnrrkczg73pbq2b"; + rev = "f626d41b9110e6ab853538d8b939979a0f1adfeb"; + sha256 = "19xak308004015avjarqdrmwwwfkyam72kjav7g7v8pg27rqckzr"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; @@ -6157,12 +6181,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-06-14"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ebc8cb0c1f73ee6c53e0560957a37a2307a70f98"; - sha256 = "0jvrqs9fmn8m1h5wdnl981dpjyp4w9b5q09ypblg6dp1f817c0nf"; + rev = "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2"; + sha256 = "0mwgyr0x21pp788k7020bb5hyj755vs7m72c7m0bh09c4f3z7aj9"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6193,12 +6217,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-06-14"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "e6179d25f7e696baa612aa35b951b5ca3f3e75b6"; - sha256 = "02mvgvdrq9p80gcgh668qajgc32pxhn5aahw0gkc40mc4f10lzlm"; + rev = "8065d69e73a2623203138bca9dc436df7784ef11"; + sha256 = "0gxzl1ly9cw9lqpxrrk4k28blrq4a7vcl7jl279zm981yvpbnba5"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6253,12 +6277,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-06-01"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "47b9a56d4bc0f877ff9469910b9653c46d462db4"; - sha256 = "09sarlw6zniph9kajvmfvxy3sjn5r7g02i4dncv9q3ybasjgqya7"; + rev = "1a5360c59dc68230aac867fe262e4efc53f1b2d9"; + sha256 = "1ns9lq4bj8s2amwkj4kil3h3lkhgsf7wvyf3w9m6419svlxvzh7h"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6301,12 +6325,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2024-04-12"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b959ad0f38881e81e757208c6adfc9e6dc24dfc7"; - sha256 = "0x4v0bpahwqcrwqv5nc0hnfc0qyc21sgd996h5nksnxykrxvf462"; + rev = "782820896b1691ed664e4c24f1cd9793dcb33dfb"; + sha256 = "171aysqsyapw434xkibxv69p5fkwha4addkqfdssdm0wq9n9cm4q"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6589,12 +6613,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "60f6dd6aa1006fa5c3ff4b7bf01586dcecbe9187"; - sha256 = "03hz05kpzrbwy2d9pdmi2yihg7svsh876fv3kk0276v9276hwi1s"; + rev = "94f1e5b81c440ec1fc7efde3c7f9448b7bab7776"; + sha256 = "0x6i732x7jxjry09fk2shn39winxgl58pjwd06v6incy1p33a9dk"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6661,12 +6685,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-06-17"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "11dea1b67bb153cd5b4a2de348ceefa69508dfce"; - sha256 = "07d8kmn19hngl06ak2ch7p0mfjwlgyim0xkjfmnsdhxd0ksqdn49"; + rev = "e1bcfc87f3566fc43b875cc714ea348c8f88931a"; + sha256 = "1rvai4z77rv6i1p1iyy49mwl7l067a295izf3wflfkq15mhq2k8b"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6733,12 +6757,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-06-13"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "ebf75f57fa8dadd8747a678724b273b398143dc4"; - sha256 = "05zq8q88z14hd9y9ywp09kxjxpxfzb72yjm3gl7px8xxh18nqrds"; + rev = "99b32492b836b64a5ff4544d4c466496f0aec9bd"; + sha256 = "0hjbllib07aqzb531fb9lflid3p09ny9bii8ds4fnpvkbic2wl48"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6805,12 +6829,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-06-09"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "f30bab1faef13d47f3905e065215c96a42d075ad"; - sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; + rev = "26ed90509c377d10dbdebd25b7094a886323b32b"; + sha256 = "1b0pw875qnisxxraxwwsb4r6b6234a3na1vhs6r1hz6h5xrxzqmf"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6866,12 +6890,12 @@ final: prev: neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; - version = "2023-11-26"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "3117ca5442c02998847131c39551b76a6ceac9d7"; - sha256 = "1apbn6awihmjxqj465h0aik6nhd2lh00k7vbpl3mrrh9pxifyglr"; + rev = "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c"; + sha256 = "08pxv39pc9w94pqf86i7r835zlvd584l5j7jznq1nf1yc1ms25ip"; fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; @@ -6928,24 +6952,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-06-16"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0481d2c79564d6658caa1a4962bdfba3a608b5d1"; - sha256 = "142j5s3fcyggkrx92w8k6d3vas2m7580k9vd6ca913adby5ys2cn"; + rev = "f5614c9cf7a056f791565183f216401b28438818"; + sha256 = "0jli4pp124ils5kxrzdba7w49jsw823rqvkjib382xa2mp5n9f3i"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "7b9e0419bd92f641f730e31a4236074e53a5ac99"; - sha256 = "1f9a0aa4q6c4armj9fjmbkpk2j2svgiyf1mlmq46g0mqcmhnnbbh"; + rev = "ce8b10e4e4f670b6f79224139053679864fa810b"; + sha256 = "1hbfdv8aw4bv8a69jscr7kynd0ik0506546qsvd39mh7mr257mc1"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7084,12 +7108,12 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-04-17"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "6965a714793d9d156dadbe734c99b3a307f65c61"; - sha256 = "0dxcnkvhdlxlxa6vrjfgn5pfi3a2g78c3xz13sxggw559wmzp9lr"; + rev = "353364aa05b94b09409cbef21b79c97c5564e2ce"; + sha256 = "1sv5i68pc24zl1gbqa94gy5wccaii2glx0bgkincpyhfycf2ydz0"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -7108,12 +7132,12 @@ final: prev: neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-06-08"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "123dda90019215646700bfec70f178ad95820545"; - sha256 = "0g0nyasr7df7wsbfkcvkpwxyhsl93iq35q46fick8iq3mdf0mjl4"; + rev = "d64a8b7e8730095ff634e6586584e8543043e986"; + sha256 = "0ikam4lmbi1541sy8sqbc4psblhizf40mspnwcag6q4w7g5pswh4"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7228,12 +7252,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-05-30"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "7614d666eaea1674dc96184e0e3c1a8bc2c4a3b2"; - sha256 = "1wz7fwcycz6xwwnw0nqsgkxz4dgmabz8rr6574yvbvyjg3blr7s0"; + rev = "9f8fb93c70e9d759d849b45859f017b348618299"; + sha256 = "03bhns205gd4hwwzcs094fczxwf9bzixn15lixw257579s1bh6hn"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7252,12 +7276,12 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-05-28"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "9e95ff4bb6fa0e7dfd40472b9dde19fd0b75aa0e"; - sha256 = "1bps5cp7ahnhw7z6yrpv9fyxj7jlgxmzfjk949lrw3ryz6kgzry8"; + rev = "131641a516085c5b3cacc8022581902e9f2f14af"; + sha256 = "1ni6213wixgfbg8cq2w4p0nfl5rhmrwvxhyifmvwf4x37lkhsx4l"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; @@ -7312,12 +7336,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-06-19"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "4c068cf7a74d77cc405aedda875f3174f7eb9143"; - sha256 = "1q5wrryf5xp13lljjgm95aavn4s2cq0p52pbxcxykm97vm1zi9n7"; + rev = "6994cf0476f1d834fb9d0b5f454b7efe650e1d24"; + sha256 = "1j16ih24yypqcsd1grd5ymczzkqd26lppdl2989mc3wwycvbvdz2"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7348,12 +7372,12 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-05-26"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "741ad26c4acc45f2164a3933f7825b0e555b724d"; - sha256 = "04yfraal84zin7gvhfrx9v5359m3s3gvrxydw7xp5rz2rvsraqn3"; + rev = "ecc584150f5c8a2a82f2e1d43201df0f65c63d0e"; + sha256 = "1rxj6sq1v0j0q4cj4js2xb3c36m38xgiqsr6bgyc6ri7xz8zxayx"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7372,24 +7396,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-06-18"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "88ac36864b5976a64b14a8f156c616f41b32f228"; - sha256 = "0qkm5g6mfaydgbsgkkng79j3zm0nfbnim30ibjpgby74fjpmzp09"; + rev = "03c6a75661e68012e30b0ed81f050358b1e2233c"; + sha256 = "0164qmf3kw0nml1sy32yl0lzkbi4g9j3vvpb1lwh8hjz7nvhpp8k"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-06-14"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "cc0a3c45047e3daf85d07c1571d65476cfce6480"; - sha256 = "1aa2dcrrwmbh8dh8vccwz2jdwyfsy10jagvqbpmh7ax1mnmphnqv"; + rev = "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91"; + sha256 = "0975xwpagsjbl1ahkdma12fppjg7k5ami0mzjynzig000f024pq9"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7444,12 +7468,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-06-05"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "322978c734866996274467de084a95e4f9b5e0b1"; - sha256 = "1l1gzpza26pybg6fcjif5ypqmxl490wv82my13bwkc1v83a5x4xm"; + rev = "61574ce6e60c815b0a0c4b5655b8486ba58089a1"; + sha256 = "1vllq6lkk7karc3n8h9wj2ax6sc99h26r96h18lbvi0nsy98ss53"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7480,12 +7504,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-06-06"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "164e8cc7fcb9006a1edd4ddfc98bf8c7f4fe2e0d"; - sha256 = "1qk0m5z5jqv875q96mavmbnpd8570d9xzr928izj807660r3b0p3"; + rev = "7b73d1111cfb41f980d25c800d86d43ad802d8b8"; + sha256 = "05llkd2l1jwcjw7cd573b2dr03zb6dgwjf6xf0a5qrj6vh9chgay"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7744,12 +7768,12 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-06-03"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad"; - sha256 = "1g0gn0rpdmypjay0dwd9iw64qvm63g78ig839ys4z2mnwqx6vsx2"; + rev = "d777c2b32ed39f61209c09bede28d7491621a631"; + sha256 = "1fsfnir1af847hmxgc6ca3hxqpnik9dv1s7ag28kzmvy0wj8clav"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -7768,12 +7792,12 @@ final: prev: nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-05-22"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "d7c695ea39542f6da94ee4d66176f5d660ab0a77"; - sha256 = "1hqnwq2hy7qn62qxp204c9mx6japjhd6q8sfac0kfvzgw49v3khi"; + rev = "484995d573c0f0563f6a66ebdd6c67b649489615"; + sha256 = "0p889jkyia04l4nhndmg4yl88mc10hf0fzgyyqj08ybzws5z9zgr"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -7852,12 +7876,12 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-06-19"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "6077a6376f9a15eaf3d60a12caca57adb59028b5"; - sha256 = "1lm9mjjqwgf4cqgh4xkq9kfbx9bjz6p68dfimixm3rlsvrxz2wai"; + rev = "07ea6edb98b63cb625ab4230d0479b5ccb20ebb9"; + sha256 = "049hibr0q6if429908v49gxijwpxghjph0981n70dzn2vk0ddkz0"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -7876,12 +7900,12 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-06-05"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "30f305d57d658615cd827146f5e56db8b6833475"; - sha256 = "0znm5am5xpz1i88fz0q6pjnvm5d41rban8wxkrxm5cyjxx1nrb3m"; + rev = "a8f6952cb1ff7bde864a34c502f1a42c360a6662"; + sha256 = "1ib95qqgk0vvn9yfag8sh0dxrl4nmxy8q87ikn50ivm7nmf2bl54"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; @@ -8007,12 +8031,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-06-07"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "941fa1220a61797a51f3af9ec6b7d74c8c7367ce"; - sha256 = "152j681hplib3vyizx1lcnkr3d411a4gi743716h759x0g20bmic"; + rev = "efc6fc83f0772283e064c53a8f9fb5645bde0bc0"; + sha256 = "1garyyavgg2xfdkw8s9jjq4p5mv5i6m54m8dszdhvkad5ni1zlvb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8043,12 +8067,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-06-18"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5c33bf1f708ac8cb839469e1a03d45987fec305c"; - sha256 = "1mdqckjmk1hdxgipa2qwncwmbv6ad8mi5cqisinkz7610k55sxpm"; + rev = "cf97d2485fc3f6d4df1b79a3ea183e24c272215e"; + sha256 = "1vs6cwa07a18p1c8q4z8gfqp7iki4qwdk10ahyv4sfgk0s1wdk9j"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8307,12 +8331,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-06-13"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "fd334e5ad0c616987d1b9114890a59c97165cf83"; - sha256 = "1s8dr79mnqw2ii54myi43fy3knd2i28c2k5g59fln2m8g90j21lg"; + rev = "965f10569d033c4e704327ef9a22d306ac20847a"; + sha256 = "0zc5dd65bcm85nwvlc9vpfzn0n7pn1xl80lm2f76nn1s4hzzxzzf"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8379,12 +8403,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-06-04"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "ec67d4b5370094b923dfcf6b09b39142f2964861"; - sha256 = "0b99x2cc18bny35l2njlfd6cv9ynxhbmlkbpkg2ikp0k3138jga3"; + rev = "49fae98ef2bfa8342522b337892992e3495065d5"; + sha256 = "027jfxxmccfjyn2g9pzsyrx9ls9lg8fg28rac8bqrwa95v5z5dgn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -8403,12 +8427,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-06-09"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "b36bf49d097a09781ad6ac0cfea28b40b74570a3"; - sha256 = "1z2drdxrs058xdjdr8khf1gm7l7pmvvysxp9ynp54dz5wlvspbxv"; + rev = "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f"; + sha256 = "1d5ffrsl1ryiq8nzxx7k69gpin6zs2ys4zc5pg47qcpazx7my8qc"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -8451,36 +8475,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-06-09"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "2086e564c4d23fea714e8a6d63b881e551af2f41"; - sha256 = "0scmn05y9ya1lwz7ad7519bq1n3ha8hs7i28kgw83r5syp0bg8zc"; + rev = "8b2c5c678be4b49dff6a2df794877000113fd77b"; + sha256 = "160sk29hg0xqg02q26gi27h9si9ara4ljazqrd280igvh32xpyj5"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-06-19"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "66ae8748fd4e8550c8b17cf115c9739aea1e4067"; - sha256 = "0hll69cjhgjnbyh6xqvk9xk6pr8fna9h1rj4nz3fkmq57iwzs812"; + rev = "6cd4ce6cab184e8787f164a182954534221f2af2"; + sha256 = "04r0gd33fkxchhnd2cdfln6g0zqn8nkad1ik5f4v06k6mk3fy729"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-06-02"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5efba33af0f39942e426340da7bc15d7dec16474"; - sha256 = "0dbw3d3d30yg79vp7008yi93n9y258imvr1baydpni571z8yinl6"; + rev = "cc908326c93473041d44398d5ebfa2bb4169d649"; + sha256 = "0gy1d7wmqvij8g5xrh5w1w5mr74sz0f4x704526wf8a40b7hpqz8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8535,36 +8559,36 @@ final: prev: nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2024-05-12"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "1428108f18ce9d8cc4481dcedebeeb490eabf395"; - sha256 = "1m73vkz8cg8qqzh9aavprhg9vpzl1sw88aq6h8sb853lgw5aa5wn"; + rev = "a8d2844bba925d9450ef7ab215f3b054028288ca"; + sha256 = "063xfbmwzrazvi21s1b01lqzyq67m7r8pnr3wyrdsxl2x8rcvjkx"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-06-11"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "06fe07d7523ba8c755fac7c913fceba43b1720ee"; - sha256 = "1k23jy33abcxc84qgkw68mzbcl8fxpvg8p5phh5pgvp5n32aspbz"; + rev = "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1"; + sha256 = "0nyrbgr0dl85i6ycyjlrzihfqz5g2s7arndhd6vlgf5xg2yj0gdy"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2024-05-22"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "cb064386e667def1d241317deed9fd1b38f0dc2e"; - sha256 = "13xyrzp9gfbnrxp6v7xxpiwyk18rnw5pn3vw01f0xvnpfsqfz3w4"; + rev = "2b7dcf6aab0947b9c4195f1d8aa592cdcd944ffe"; + sha256 = "163nj4y192ik63a4c3d8z6qpxyic6xflifm5nnhq0plzws4hqnc1"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -8679,12 +8703,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-06-17"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "7e087da48bd88fb3a6c6229a97713ac35694337a"; - sha256 = "1dgqm7qjnkgz9wm8fv5j6q2f46ip9hac1csbwxv7lqavi1xw9p0l"; + rev = "e170641143704068233ba1d301e75684b67fc07c"; + sha256 = "06z445zphqz7icz65gajpj17c4g133kivnv59jw73d31rvja3jzj"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8715,24 +8739,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-06-15"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "1f0029d5283443bad9a818fd7d9db253404bf8aa"; - sha256 = "1il6jy83d56lxlgxyklvl76dxk7iikq2941jl6ihbf0v5lbig472"; + rev = "7731ca4e31b32c176a383642ffcd7d593ac17774"; + sha256 = "1gfwplw9zfxlx04b9sa0ljya1900qkdd992sn771ifnmkc4zhl6f"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-06-16"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "64a3a555b40d96faae488ed6cf5d0f8b38520891"; - sha256 = "1wmg72r6ydmrgiy4c8jv8fpgkf2wwxpyq7zv4a2bx4imhly4zccx"; + rev = "b15e4c1e647b9ddbb75a31caeb720b3b3ce4db54"; + sha256 = "1aw3ddn2cg9h0z5cxmvpyjs29crhr4sb1yfs0481m0sprfqi6ywj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8764,12 +8788,12 @@ final: prev: omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; - version = "2024-05-22"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "Hoffs"; repo = "omnisharp-extended-lsp.nvim"; - rev = "f872cfa38b30a34e179fb028f68588d09bd44114"; - sha256 = "1xlnfr9vdvxhz09njz2lgyiww10fcg79vzm372zqw99dcqr9jm4p"; + rev = "aad7bf06b4ca0de816b919d475a75b30f5f62b61"; + sha256 = "0bjsraykq6xjzydrki7fwm3yxfvkqd46qqc0vv3yvy9hdxll4miz"; }; meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; @@ -8824,12 +8848,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-06-08"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "308527d45efb9f2a0bd4b4004c1c02023557ed6b"; - sha256 = "0s0wm06ymagrax1lngz81p7bhk2f9k2ivxy6vx2a7fwam8yayrfs"; + rev = "69256ee61f29727760c3d28020baf1e7b951fa12"; + sha256 = "1xy3kz5ng0lnygvgw4wb6rs40hn7j217pfv5qsdkl89jrlq9cjsf"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8908,12 +8932,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-06-14"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "cc51c1914e3f0bf20bd543a7176df5bab12ec247"; - sha256 = "1pr5fh2pr3awmxvaw0n811165nf9p3n0pp2cg4f8qs15y6ncbkq7"; + rev = "7a256b5a87e8c81a034661e9904c739f89961323"; + sha256 = "096ya9zqqhdpg25xwvdn05zw0q40nk27byprfr0bq1g6q71x3535"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8932,12 +8956,12 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-06-09"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "cbb1be0586eae18cbea38ada46af428d2bebf81a"; - sha256 = "085lx5z7abbn7rq23pma5xmymzgjajp0slg0g42wafxpn7rby9kv"; + rev = "e8787988f2f51dc4678aa13c4553613fff0132b5"; + sha256 = "0a967hspxg2r8rzj02m8l0n8b6y47gg9p56jm9m5z9jgzn6s5039"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; @@ -8956,12 +8980,12 @@ final: prev: overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-06-14"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "d78fa84c06d37b1eb3bd42b4b5467c7476e74589"; - sha256 = "130y8gjbyr3bg9l24s0iiiv40wpqq48axzvbjpraalca181zkhcd"; + rev = "8bda5b073de30533e04f61b661cb7c22d7fa4f23"; + sha256 = "03i9lvsr01ml76l1m0dzvbgwk9k25lajmgxazqn5i282s2d6bb35"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -9089,12 +9113,12 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-06-15"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "0a9eebf5cc92b1113a382a660ee73f21ffd62ae7"; - sha256 = "0gyacxix6m9wpzlm6a5p1s2aa9916750fd8chgkga8m3q34bdq9a"; + rev = "4df3f8a03690add1bc2f9a79b31e1c43f5e0dd05"; + sha256 = "1l2a2ilavshxczjwb2rf405zzladsraawby7z1gflw1m3g9qgiq1"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; @@ -9173,12 +9197,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-05-10"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "44054d6d2cbcf01a064858faa3364cd30d38057d"; - sha256 = "0kwk96y6cn7l7w151438sdjflfc6c6irysg00b1q4h1f4x3fcfvq"; + rev = "1592944444513c208ab5a087397ba987932af750"; + sha256 = "0j45p1f8kxgmbw8kmcvvyby082vk8dgyb2q7vscsy8zvmqszcm24"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -9415,12 +9439,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-03-06"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "67e09027b5d8bd948907734fc6fb15028ffdcd28"; - sha256 = "07p45qmxnc10kfn9syfqv5v5jm75rd8bs9gv90a246dxis4p0515"; + rev = "09fabb62d414e56ee3245c558aaedbdc662b6493"; + sha256 = "005lf0iq0gfkxvknkw727h516kd4ghd5nc9cayxayjlpvr65gnm3"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -9570,12 +9594,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-06-15"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "e6b10b2346bd7e469a5f17099775ad906da153ae"; - sha256 = "1m0ah5f1w18g7y78ra78yczzpdb4giwk9hsig3379f26xz5fknp2"; + rev = "c9c1a0995b7d9a534f3b9a4df7fd55240127eeb4"; + sha256 = "1fajahgd20cn75xaz4qq0dhvqr2rqr788l874n9qvk4mq4qqvnj2"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -9630,12 +9654,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-06-10"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "c7944769dc489b9e4bc493e40820c2818eab2569"; - sha256 = "14afbxl60k2197zl8vs4rskb0rs09d00kvnr0zsnvzydv5gf38pn"; + rev = "e7843c55f9df6a9db9f97dac180035c6ff895a90"; + sha256 = "02iksjxamy83zix1gr495bvigvyzpv466wz6529nydhwkv8vjnbd"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9750,12 +9774,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-06-18"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "14a5a4bdf23d1971d1a6386b73b89e57590a5e7d"; - sha256 = "098zlwlrdw5icvns5a7qp4bl2ly1imv2fm3981i9wqdvvvzqmn3k"; + rev = "af4de6a35d128ce71c75a9a7846bf089aea76f50"; + sha256 = "14hxzaxsasrfridhkpsa8wva9ych633n268mlipsmibyq56i5isv"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9991,12 +10015,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-06-15"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "3d9fa9e4b31c30d6b328f2447a4dc7dceffbc2ea"; - sha256 = "1pvi03f98f6lys6l3jlra9l95dpavdc9y8ghl91mlwvlglrnwjrk"; + rev = "e186518f9d7eb4b1e43fbbe0c52bf323637194d0"; + sha256 = "01qfr9qiq39qg4d4a3wv2i6i85bwlr77l7h54xfsa3n98h93vlhh"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10075,12 +10099,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-06-03"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a90d437f1f4e48825150065987d175e2a45fa39e"; - sha256 = "0w7y53mdpb7xi26bm9xrhsszxngidcxfpwv7z9h5bdn1x53sb8i2"; + rev = "16fa31a410183ce945e58d834a74f161a2dce5aa"; + sha256 = "0sa82fcibwwp3dvakqd9wa0lkgwgi0hr89ffal2y3c37lslzvm4s"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -10582,12 +10606,12 @@ final: prev: tabular = buildVimPlugin { pname = "tabular"; - version = "2019-02-19"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "godlygeek"; repo = "tabular"; - rev = "339091ac4dd1f17e225fe7d57b48aff55f99b23a"; - sha256 = "0jq91770wsp2waw7pywxjqx59v0vg54gfzirgcd85pg61w22bfla"; + rev = "29a6b21dd991477a9e137fe8891947e2f2e8bb45"; + sha256 = "0q76w0xj443fn5a22wksp14f3s55ll2xq0rbdaj37xdd8kddlg8s"; }; meta.homepage = "https://github.com/godlygeek/tabular/"; }; @@ -10751,24 +10775,24 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-06-19"; + version = "2024-06-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "78570e237c8b2494dd74ffe196fbd01d0c9e5460"; - sha256 = "1vsfsi39i8f8x6cbsrq491s54p1gh8fh3a0vjgik7x07a9i21l6h"; + rev = "f3f93253797714aecfb95ef7e25f8ff7693430b9"; + sha256 = "1kmikgn75i93ajbi9v9rdm2v2z4gnsslfq9acy2h7lrzng4z9gav"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2024-03-05"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "9ef21b2e6bb6ebeaf349a0781745549bbb870d27"; - sha256 = "0lvykmaarl5nd3iaphp8jgnxg6cly5p6ignd3i1450rpbdp1w9xg"; + rev = "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b"; + sha256 = "0h741m7rcm5kl0mq9kkzw6za2h53chavpkai1qp433plaxzlyj0q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -10836,12 +10860,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-06-03"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "da337930d3998fad976331155e789f8785543e68"; - sha256 = "0fhic35pnalxnlqnmq4xs4k4gcp7cs8j724chd0i3pvmbixk8b8y"; + rev = "d2c8fee183d6b414128acf376f5c8d3c250ae225"; + sha256 = "1awha1dscjjxf10nha3i8mmmv44m1b99k77ap9p33s4whrmxfd2h"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10932,12 +10956,12 @@ final: prev: telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; - version = "2024-05-01"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "debugloop"; repo = "telescope-undo.nvim"; - rev = "95b61c01ea3a4c9e8747731148e905bbcf0ccaee"; - sha256 = "17imd6f1qykxv4wk67ihj7ir07yvcmrr0cqvidv1as3k77riclxb"; + rev = "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a"; + sha256 = "1xz2fccjp1rv7l0xzkczz4z2w32q8slc9lc6rm5219s1hl7k4nam"; }; meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; @@ -10968,12 +10992,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-05-08"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "242ee15047e3400351982ef162301a898ec5cdda"; - sha256 = "1kdjqi046nr052q9m50814k2df0nnmylgk8lcragc2z8sdnj5f73"; + rev = "3f565ad0c0643d6592b5c3fc44b09b4fb2badc21"; + sha256 = "0xcg0wj45ijkgrpgv6vr4qx2rpbm6v94sdjcwjv3ghh16hh1wc3n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -10993,12 +11017,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-06-15"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c392f1b78eaaf870ca584bd698e78076ed301b26"; - sha256 = "14k0z9k0d8krs50filg8d38fkcpxv4gy9lilgfj2wrvssd6c9vqy"; + rev = "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a"; + sha256 = "1ysbn67rlf2p63pp8155198a5v0hv5cn2bbhdjz9r5255y5f19sk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11041,12 +11065,12 @@ final: prev: term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; - version = "2023-12-03"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "chomosuke"; repo = "term-edit.nvim"; - rev = "e04f69d5828c6e6a4d81c34f75f18762fad50372"; - sha256 = "1kh70ivd6p9f3xsf09iwyy94gvkzprv08ln52sh44n90s1yr4ql4"; + rev = "32e802c6ea08304db6cbbf44e6ca9805b8c2ad51"; + sha256 = "08bawjw45fmv86b81wghczjk3km00fbxc10ia1hg3q05q4ky724w"; }; meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; @@ -11246,24 +11270,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-05-19"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "fee58a0473fd92b28c34f8f724e4918b15ba30a3"; - sha256 = "1iavy1182n0fwiv6rr6i9lb2kyqbw1fg49fy782nsbmkr25b7kc7"; + rev = "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d"; + sha256 = "12mcsq0dbzhvwq5sq5ijq9cdjxgcr3c72r6zhlgr0pcvarchl7s9"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-06-13"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "81c867c5f638597a82c82094dcb90ed42444dabc"; - sha256 = "0bq6yjzv7sza4f2mp5x7bv19pg0mj5j6xh3crz4q20l16f2i3hag"; + rev = "c8177ab6fe216f121cc0c4f59e7f1ce59670ce41"; + sha256 = "00sm68wswk2gc2sgaww6x9klbdiz69sx18a9zm9r2if41ymabyzc"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11355,12 +11379,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-06-14"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "58a3acfc6d8d819324dab4c87068596319032e64"; - sha256 = "0vs7s7byz80mdww86icvgk7ksvbbgm67afiw8vn19ghf2hr78s8r"; + rev = "e5d0e04121c662ce29190a57dd03655d43c59d44"; + sha256 = "1mqdsy0ainbq7rrr5jf1skw6akyr222krgajawzxbzx696hj46l0"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11439,12 +11463,12 @@ final: prev: typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2024-06-18"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "3f942ec187523d1d82f813106ceea9be9dac5287"; - sha256 = "0yr8vmfq6rm7xd39jig1k6fjqhzb7pi0x9iy9mv5vvixj4drz21i"; + rev = "5da4d695d66f676eb6ea766b946e86f93baaafe7"; + sha256 = "0pbk9svffxky1yrl7r7dlylj8iqadbs5zn5iz24fglsv1c72ldjk"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -11475,12 +11499,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-04-18"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6"; - sha256 = "1l4mq2m8s7kav6hpq6nay4xyy2jvq6jbblyy100yfb9nrzkpggpc"; + rev = "4d18ced62599ffe5b3c0e5e49566d5456121bc02"; + sha256 = "011kbs2fqg2bp8nb17ppgv92x89dlxw5sjn5y303qg13xb7f9s32"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -11535,12 +11559,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-06-18"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "e354912fe85c39ae0b148562ddf31aa622e24638"; - sha256 = "1k17nkcdx5xlsw2r6izsyh1fjjfa9mj1v77yd00wznibczd9jnkq"; + rev = "a74d4e8cb9cd860ebd79e348f8012f57625e2239"; + sha256 = "0m8dc3lixww9x9zasxf2n6g00jimqx6mzlszmggmawhj52sg76gj"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11631,12 +11655,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-05-04"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "41b6887ff6589228c7d4f213259d8e274b0f9ced"; - sha256 = "01whpq420w2ki00wpiz1dwbddxwzyq485rrw8mxbbsxsgq8plzfw"; + rev = "225c0552f55b443340eaf5505f6bee3b83fad54a"; + sha256 = "1xbiq6n1p8j8sh0yx14nxynsz26rll2ax5hwrcjc6g8ahgj38sz8"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12699,24 +12723,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-05-15"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "5d5ad196fcde223509d7dabbade0148f7884c5e3"; - sha256 = "146zgn6cgzk1m9r09v3sdk3vzaan80jwq1zf0fskxk1c33jg1zpm"; + rev = "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d"; + sha256 = "0v7djs9q69aglh1gpvynbzcvaxf5fk2jh4kx9ssmwlh2070qqk8b"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-05-27"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "0dc68d9225a70d42f8645049482e090c1a8dce25"; - sha256 = "1wmx9wrcffik5b73q9g9gdhm4h84h62s5acwz9rxzwf24amdg1y3"; + rev = "2527310098e7458488e61a528614da142aa2dc42"; + sha256 = "15zjqzpap035g29f0rf0yw9017r6aapv8w351ikaivfdp05ypdbr"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -12939,12 +12963,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2022-06-25"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "6dd03f87d825bf0a9f8611eb54076c7952d4f15c"; - sha256 = "0car62bg681al01bsf7k783m2927shdl5xjl2jlwry54l44b8hry"; + rev = "c23000a030bf14f721d10c0d74e5f8721ac2f9cd"; + sha256 = "1zv3xy3p0315nwnliyr06p03ghpmygf5af5n6psrz57m7czlb2s7"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -13263,12 +13287,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-06-12"; + version = "2024-06-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "64d6cafb9dcbacce18c26d7daf617ebb96b273f3"; - sha256 = "1ddab7xflb08gy168042k8w35z84hdvrbz5kx37v96skayq30rni"; + rev = "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe"; + sha256 = "0g3bx7jnyra8ia11k7bqv0j41pwkbdz7bxzffxn20dyc69vkahxz"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13419,12 +13443,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-06-11"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "665ef24144b748b842a0a27c237e63f3447f901a"; - sha256 = "1yh9phdrax4b5v9bb37n8bzxbi6a8ca422c90f73r9cwgvfx4i2v"; + rev = "a64d097a1af1772c24d13f34529b9be2a34b7721"; + sha256 = "13g79hgfqaismmd74751v3c5nhv8dmmrv5qpqbx7ghh3zd7h65kv"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -13479,12 +13503,12 @@ final: prev: vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2024-01-24"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7"; - sha256 = "1bih86rm14788b73dkpfzv2ahrca3vxahd5pc39lx122ma31l639"; + rev = "008b7773e5f2cba625a5fcc5acc543b28b19cd26"; + sha256 = "0qligdiaxa7liikgm4hpda8i51y1dyzd1xq7c2kwk4ysxadlvk5k"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -14021,12 +14045,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-06-17"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "5ad2c6b625d40d929d58cddeca9c459d5f380755"; - sha256 = "0bmm3z4njnajv1qzqam9i9lfsaxfw8n792wzdyg7yklp534zaxxn"; + rev = "c771fb5f00fd219833600c8164e6befe3c163b9a"; + sha256 = "0jlyy64m6zwvjs3w61vp2zv9rwdds1g3pk4wknvq493fcyxc59wa"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14249,12 +14273,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-02-25"; + version = "2024-06-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "f7ccf006df1aefd327c0e2c55cc8632a2db577c1"; - sha256 = "11hnym6gzvss1pwjxqsbg4f1h56hsnaypl35bd084lxhim7fz6zl"; + rev = "a8f244a4e9527992acd89c578933ad1d3940d276"; + sha256 = "1xxgyawfr3lw5qqgkalajmnanz4n1dmbw1fyv362b72jg7h19fh5"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -15150,12 +15174,12 @@ final: prev: vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; - version = "2024-03-15"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "729f3630a4c19e52e1fd825802d2a1659daeaf48"; - sha256 = "07mg6m47x9ab6awlc1kviahgzmfdxm1ykvnqrlf81msa5gb4a36k"; + rev = "3736bd4a5f23b30821cbb892385bb1f1b0088cfc"; + sha256 = "0q5jly140pjf9z6cc2n8g833glwpal07lrvkcq9ay3gn9pznpjwy"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -15318,12 +15342,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2024-04-12"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "8972461e64c7c4bf049f2f86ea1bc571e8077b55"; - sha256 = "08lzlk2lhfcyp45sk90h3j6diwz78c8hx0dm1wb9fykmiiipsr0c"; + rev = "2fba7907f585819a8653f0bc7dd7f437a822d9c6"; + sha256 = "0a2m0mszy2n8xi1c47a7w0kmrnxpzfirxnzjghkdm5nc2fn3rxgn"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -15366,12 +15390,12 @@ final: prev: vim-rooter = buildVimPlugin { pname = "vim-rooter"; - version = "2024-04-23"; + version = "2024-07-02"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "45e53f01e4e1c4a3ee20814de232162713aff578"; - sha256 = "12dqwhks52ng0hh98a1sbn5qjmwn77ch25h6n7kp1ffql6gjsadi"; + rev = "4a0df2f1b0f3d69e8f7e19afe464a7c3a7af89a2"; + sha256 = "07a5543ms7r129bb5d7iwhy4pdzy5ygz9w2gziczpcwj40b5932w"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -15738,12 +15762,12 @@ final: prev: vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; - version = "2024-01-24"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-solarized8"; - rev = "6178a07f442a1fe559673cef6ac2b7031ab21edb"; - sha256 = "0y0xhcd5p32sni889avjsbjm9g9afysfvfkihm763lj304rf7prs"; + rev = "c4fd8a45767dea23fe51816967cdb3c86436eaad"; + sha256 = "1673xf59xxh6npw85hzasdyxx7kbqp7hbkmyx77wc2id3la6s9x9"; }; meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; }; @@ -15786,12 +15810,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-06-19"; + version = "2024-07-01"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "64b8125fdca0e67cfe7c415f133809a4d23eb8b5"; - sha256 = "01r9wz4sc7qlaibi2hhrymcgzrfjchif3cn9w1q71prbvchjhpnm"; + rev = "a4e55d1119689a16e659ce95b673f7174a615637"; + sha256 = "0iba20wlhqvhrsh4nfd2gfm2iwix2zz16f0izmkc2h4q741rp86n"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16027,12 +16051,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-06-15"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "79c14672b0bfec6f92c626dc331326fdbed62b4f"; - sha256 = "0vbfnqggh2lwcpfx110phlasmdqq66fdjcgvanydj1vqpvfn8fsa"; + rev = "34aab77f7a63f20a623df45684156915f6182a55"; + sha256 = "0bvziqnnaimwrrjmz8k701ki4gdvlhvjkj4fxnb77ab8rc0sp13h"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16351,12 +16375,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-04-26"; + version = "2024-06-30"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "b84a6d42c1c10678928b0bf8327f378c8bc8af5a"; - sha256 = "1sj8nfn2yd1bsfqqf9kqpivxhfjcq1zq111ls9m6xh98ccxwcj7d"; + rev = "525521677deb8401b62054bbbbc9b17f8486de3d"; + sha256 = "0i8n47y9xg1583908sa8lhkvz146ch65i9afcmgrsngjys1ihaqb"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16772,12 +16796,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-06-13"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8ed94566e6fe3f5b163131dc374d224d2d320db7"; - sha256 = "13na944xyy8cj6pck6af4p9hhrr3811pa43zmmj42bxrf5kpbqds"; + rev = "2dc2a5435809c13f6f4aa07964be4ef19a7864f5"; + sha256 = "1s3w4kbdvwvqmpv82hkdizcr28dyx61mwxfg0k6hkhnpr7fimz6a"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -16796,12 +16820,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2024-03-16"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "69318e74c88ef7677e2496fd0a836446ceac61e8"; - sha256 = "0z7bh2zc5mxf5rdma160sdawm1czdqfhm6rq9lj1780g5snvc0ps"; + rev = "705ad1e0dded0e3b7ff5fac78547ab67c9d39bdf"; + sha256 = "0wv0lyfxd5dfgmj3j8qpf05014isrm1py9mrxkg6zh8gnbv7d72j"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -16868,12 +16892,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-05-19"; + version = "2024-06-22"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "ff3926901d4160886f707a8a70b5c2e82979a7c4"; - sha256 = "0x8930yals2cwbyw4vssfhb39pvrwpq90ysh1aczcyivrajm24ir"; + rev = "46212834b32866ce45479f885ca82d2259044f46"; + sha256 = "0lp101ac8ylflvdngv2xmpl8v00djrw4ca6pbrbf5jdl0wm1fnmq"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16952,12 +16976,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-06-17"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "da5f1e0a5acd70d4e44c54b4d6286fd8f97742ab"; - sha256 = "0aiy18yw2kkj1xb7ixlw86xlxpn1v1pqa19d05kr4jnbabdajcr4"; + rev = "e8cf7e92220fc1ed3c20c8744a511b917afba7b5"; + sha256 = "13fic83d631xxfaks2ncda3id5y8dy072sa56nkr9fr7yx9nbw6h"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17253,12 +17277,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-06-03"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "1f331d994d90f1dc93d023508951be437d19813e"; - sha256 = "0zq18axf849vv90nc5x3g2mr2wc6wphgwj3a8mmkr8q1rk16c9k4"; + rev = "15e24e96cb90889ebd12b5dbe800a958c716f520"; + sha256 = "1sjnwjv4spa2cn54mv2cndirypkzhm81zxjz0v7kb5pf39rlq03c"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -17289,12 +17313,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-06-14"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c0bea773a09e49e123136b099bce9ddc1bf395d2"; - sha256 = "15ccqv7r382rk8l50ims0a9m5kn4kzgd3bar5427w12skayp0d09"; + rev = "31fcfb02c47952d5c75aec893b93b2878abe5fbb"; + sha256 = "0n883l071d197xqfji5dj3qgi3dvk1v9vmr1fdr1gnc9fmcpa672"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -17325,24 +17349,24 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-06-17"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "2ab955cb0b5eaf0b00cc5064234064f02822f458"; - sha256 = "0ncr3kf7s0j2ghr0321vajsfphs4cp710xxrwdhphfxdpzxjlsbw"; + rev = "dcc90e04ac9c9392bf32c1e5f701353d8c5290c7"; + sha256 = "0a5lb5a4c5c39nhwy6vyb2d8qkjpwxdmlff84m4z116q332rc9b1"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-05-21"; + version = "2024-06-24"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "c707723cf0c0f19a409a6190209d51d6ec057943"; - sha256 = "14d1l8a6g0fflkqs2ks2fgawxl1qqhx36izxvz5yacz1yqz63dnb"; + rev = "f3e3ba2b47b57fc501b096a38b37bfc12f22f298"; + sha256 = "1ph3g127qynf797vnlq5kramkslj062bjzhpnxcsr9vjsn5a9x78"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -17385,12 +17409,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-06-19"; + version = "2024-06-28"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "b20ee4855bd3cb9fbe0615cf0e27bbb8b04df13e"; - sha256 = "1wcvnx0s328md2zil1gwxqsl19jin5vmpxvzajjx52yxsrgm0qrm"; + rev = "568a0cb8595f1e5363dc220f01ca6f18517ff80a"; + sha256 = "0c3ihcl10mskp5jd1f9xnvypyrf0x5db1gks2i1fb63cmh64ibld"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17409,12 +17433,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-06-15"; + version = "2024-06-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "75a0044e5f4d164d93557fd49863e088f0ecf749"; - sha256 = "1md8gsibb1224df6qi2vnyxp5ja51vfppdziply33zdlh7qa6ycc"; + rev = "3c9e5cb6499f66a02c365f073145a835124a19ac"; + sha256 = "0bghzwkyqgp3g76irbadv3bx4npvnq2x16j6fdxc01906nn3iz95"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17457,12 +17481,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-06-09"; + version = "2024-06-27"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "8c4660cfe697621bcc61d37b3651ffed94fe7fed"; - sha256 = "1gdjd9a3y2kgsjg5ivxwmqymibgzhhj1h6lg7hq811jlip3p0p63"; + rev = "e10c9c6436556405ec6b187fd459a718f5c55156"; + sha256 = "0d7cv268gzrz47brax66h2kv2b4b6ks3vzdz97si8khh70jds59d"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c4a0aea589992..84865e7300448 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=10f21f3"; + version = "0.0.0+rev=5c9b47c"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "10f21f3f1b10584e62ecc113ab3cda1196d0ceb8"; - hash = "sha256-hBvDFLIN4n0dbpH8FKe0sY8t4Jwa0GtrLt2GG04Qgn8="; + rev = "5c9b47c6a978072808b356065fe8f223cdc8fc07"; + hash = "sha256-nln4A2zIaFvfvWMplMDV3XMlXLEFfqx68GiNoFSR2/c="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; @@ -182,12 +182,12 @@ }; bp = buildGrammar { language = "bp"; - version = "0.0.0+rev=2326d70"; + version = "0.0.0+rev=4e60cf3"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-bp"; - rev = "2326d709fb9cf73cf124fdbc803c267f851721a4"; - hash = "sha256-h9T8tfS2K85N9NLwYj6tu2MHPj4YyG/UBYoezfWuEyI="; + rev = "4e60cf3c2e613625c06f6f85540b3631e2d06cd3"; + hash = "sha256-E8xL93rZx5I1RWXduBZdfVnogmha6TFQz4KerNWrpTI="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-bp"; }; @@ -259,12 +259,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=4864abb"; + version = "0.0.0+rev=69d7a8b"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "4864abb95a1f6e54d6b362677beef9fb674b41e9"; - hash = "sha256-asJ4BDARnQdc+d0H+DDpW+/gDGuEIbc8PVL0B3KrA0Y="; + rev = "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"; + hash = "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -359,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=1f188ef"; + version = "0.0.0+rev=b93070b"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"; - hash = "sha256-AZXk29yM21KOTVWWUKkr1+sr7gv7ViD6kDjwrJZoCzg="; + rev = "b93070b5a91ee9537d45e59d741737b1289c5dcc"; + hash = "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -425,12 +425,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=629676f"; + version = "0.0.0+rev=19dd5aa"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; - rev = "629676fc3919606964231b2c7b9677d6998a2cb4"; - hash = "sha256-E2l971rSVAuSiLDVMto6hjViaxDLjA7LFQM+/evMXhk="; + rev = "19dd5aa52fe339a1d974768a09ee2537303e8ca5"; + hash = "sha256-pS+xTdJWhb0pmWecmlnQb6PwkAUTG5Sry3Jf7zWseU0="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; }; @@ -491,24 +491,24 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=648183d"; + version = "0.0.0+rev=809266e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; - hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; + rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; + hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; earthfile = buildGrammar { language = "earthfile"; - version = "0.0.0+rev=b5bdcb5"; + version = "0.0.0+rev=5a86415"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"; - hash = "sha256-fhHu8kniYOLhrlHLgfP1NHtBxURrM7GNn51zmPNcTIU="; + rev = "5a864159ff728b6d4f7d0aab3723f85a467d180f"; + hash = "sha256-w36h/4xGtGZpJu+ueZiO6K4Eln0DkNUw6a626urMbz4="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -603,12 +603,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=b8e44bc"; + version = "0.0.0+rev=da275db"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"; - hash = "sha256-9sfucj3jx5KVt/okHyCZLIJUbYFHPO4Ld/IWWjVXKDA="; + rev = "da275db3ae46bbd00f97d11f888d8c58c14faa6d"; + hash = "sha256-05V1VLmafWgdAHaNiBj4YYl9/W54j6TNSH5CLnh0fjY="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -779,12 +779,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=d8a4207"; + version = "0.0.0+rev=274e27e"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; - hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; + rev = "274e27ea0f09371122ab55b8a812a32d6ef644e8"; + hash = "sha256-W0aDOZ2uPXHGAbt/p3slyotw4dPsmgADnRAH3e9NT1Y="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -801,12 +801,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=edd817e"; + version = "0.0.0+rev=aa5c279"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "edd817e0532f179b7f7f371dc180629070945f0c"; - hash = "sha256-iipzgO8vJJpxhf/ZJh6tsfRa54C6g9rAN9TVdycKiqc="; + rev = "aa5c279287f0895a7ebc76a06e55ac3e4b2df7c7"; + hash = "sha256-TjHaogOnerLUvCxEOBkqfc4ZtKmgmpU8vQyDmaDsO3Y="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -845,12 +845,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=7f91bf3"; + version = "0.0.0+rev=3736dfc"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "7f91bf34cadc06a96efc475df501ffca4dda9410"; - hash = "sha256-M676GDkyUGosih5R77duEy4jUrIz3bGwD+G6n68gJX0="; + rev = "3736dfc811c07fa749ca818f94c9a3977734dd26"; + hash = "sha256-BIEM9i7GItQZmOcJDMHm2yY+4xeL5x9BzZORtYOxr28="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -1032,12 +1032,12 @@ }; hcl = buildGrammar { language = "hcl"; - version = "0.0.0+rev=422cbe1"; + version = "0.0.0+rev=9e3ec98"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; - hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; + rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b"; + hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM="; }; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; @@ -1077,12 +1077,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=5e1225a"; + version = "0.0.0+rev=80517ca"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "5e1225a30712ca0a9040509806c7ba274a1bbcde"; - hash = "sha256-gBByrpw5iCGoOy1zrg0emuAd1Vd8KOKFeJLZOCWh9qU="; + rev = "80517ca13317fb8591503c0d99f2ad76e8979a72"; + hash = "sha256-3MoTDW0LyZd0wge7R5d+H7QG9zPBykXVE73eJEWMdK8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1143,12 +1143,12 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=8d22f33"; + version = "0.0.0+rev=2dacda9"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "8d22f33faa5aa95c6526606fb656ada342e59e40"; - hash = "sha256-L+9cDLTmisZmdBXocK8u7fkJIlaZId9qeQxVWwFkdJg="; + rev = "2dacda923bafcfeae487e457df0fc1c95f6d1848"; + hash = "sha256-JunYDINufbrbVduLrrX73rD8L6MC5dEie8yq92qTFe4="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; @@ -1165,23 +1165,23 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=c9012d6"; + version = "0.0.0+rev=6858695"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tree-sitter-hyprlang"; - rev = "c9012d6dcaaa939f17c21e1fdb17b013d139e6b9"; - hash = "sha256-yI/3DVX2SgvU+mP1KVe7OA8OtqXbaZG9/mTUQjUHCgk="; + rev = "6858695eba0e63b9e0fceef081d291eb352abce8"; + hash = "sha256-5csAj7k03QEEfkZE/EBmGjqUHPlFss3EWvExT4kaiQg="; }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=9f56001"; + version = "0.0.0+rev=966797b"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"; - hash = "sha256-L5O9pep1No4oWSM7nA71RYY2X688+rm/2pTETP7ifOA="; + rev = "966797b8c581526efdd2252f815dde6de1a8f932"; + hash = "sha256-q2aBAXUVjhcoHH7iZQllLkDF5ZMuIxNjWu72Xt+YdXA="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1220,12 +1220,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=2a05cab"; + version = "0.0.0+rev=3b08641"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "2a05cab838dfec52daa76f10920917d2e69a85bc"; - hash = "sha256-NOnm40FSzTX6Pf4NchH0hYcTwyxX/usEVKxz8KsIlk4="; + rev = "3b08641373cb3e37bc531e6e3cdb85d02b454702"; + hash = "sha256-0bCagqSY/MFAqJNajkaR8Y6J2YiXzOF249cm0pFjTfs="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1330,12 +1330,12 @@ }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=fd814fc"; + version = "0.0.0+rev=379fbe3"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "fd814fc6c579f68c2a642f5e0268cf69daae92d7"; - hash = "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU="; + rev = "379fbe36d1e441bc9414ea050ad0c85c9d6935ea"; + hash = "sha256-rJXgKNYnAjpAh+1dfYH9W6v5t457ROLtjqU3ndzvjr8="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1407,12 +1407,12 @@ }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=cd82eb4"; + version = "0.0.0+rev=08d8b88"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"; - hash = "sha256-ptUIi8cMQ4CrnqZgnzJ0rnByd78y8l607+CSPKNrLEk="; + rev = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4"; + hash = "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1518,23 +1518,23 @@ }; luau = buildGrammar { language = "luau"; - version = "0.0.0+rev=5aa9b88"; + version = "0.0.0+rev=fbadc96"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luau"; - rev = "5aa9b88a8e3327276ec6e72de997f04ac80b1ae4"; - hash = "sha256-7cxnELiCmLOPecca3U2CN1F4CUSbL8upxAn0PxwU6dM="; + rev = "fbadc96272f718dba267628ba7b0e694c368cef3"; + hash = "sha256-qoKLG9hPyvcpDEssSrsUnr+w6B8qvXXIXLdvoCZhjic="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luau"; }; m68k = buildGrammar { language = "m68k"; - version = "0.0.0+rev=d097b12"; + version = "0.0.0+rev=9e082a2"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; - hash = "sha256-y1nioJ2R0YgGLH7dkJsTxIkejfMnh1CU+A++yTaQdb0="; + rev = "9e082a2253c50eb3d80e84bbd635e57cfb1476a2"; + hash = "sha256-QJZDozY0UO7tWemKGk3MjDrM/bjpbwCJbWXY0fTL9fQ="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1575,12 +1575,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=79d8b25"; + version = "0.0.0+rev=2825fb5"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "79d8b25f57b48f83ae1333aff6723b83c9532e37"; - hash = "sha256-DCAMxQqWHM54yzNzF1FjaU0+vETbLhfSZXNq+62DzhE="; + rev = "2825fb578325ac308945318881445a89ea06e0f6"; + hash = "sha256-M7dECDfpRZHlkjCNvQcAneKR9KHf6HwtoHADZRjIB/Y="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1619,12 +1619,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=00c32d8"; + version = "0.0.0+rev=268bc99"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "00c32d8562dc957b187da110a3443307962b8da8"; - hash = "sha256-cyd9n1ydIEoBL+hnRiCSEC2S9H1hrWZlMCxVbxWyazI="; + rev = "268bc99020f7ba7a219f839e3a6a31c36ad0826b"; + hash = "sha256-jXcnM+LEY35GZd2HYtFE5Of4CBga1zZuGCPazKWAppA="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1653,12 +1653,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=43433d8"; + version = "0.0.0+rev=3039ad9"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "43433d8477b24cd13acaac20a66deda49b7e2547"; - hash = "sha256-9Ei0uy+eGK9oiH7y2KIhB1E88SRzGnZinqECT3kYTVE="; + rev = "3039ad9e9af3c1ffe049a04ee83a2b489915b0b9"; + hash = "sha256-a4NU9tzQ+g9dxF3/LAkEm83QnEJcAoNcIrrQwXSSTPE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1697,12 +1697,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=b3cda61"; + version = "0.0.0+rev=0fdada1"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "b3cda619248e7dd0f216088bd152f59ce0bbe488"; - hash = "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y="; + rev = "0fdada10f1f845ca9116e279ad8f5d0ca93e9949"; + hash = "sha256-hnY0lDF4S5W5DUJXNcXt2qySnCu16AgEiGmy/zQSzu4="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1752,24 +1752,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=0b12614"; + version = "0.0.0+rev=cd95a67"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; + hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=0b12614"; + version = "0.0.0+rev=cd95a67"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "cd95a67cea8c839d62fc5206ed1f5c66ff9ca255"; + hash = "sha256-2yuMHJtG1xHiHzMCrr72UpTjKHZP9Mxbnq77g67qouo="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1964,6 +1964,32 @@ }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; + problog = buildGrammar { + language = "problog"; + version = "0.0.0+rev=d8bc22c"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "foxy"; + repo = "tree-sitter-prolog"; + rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; + hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + }; + location = "grammars/problog"; + meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + }; + prolog = buildGrammar { + language = "prolog"; + version = "0.0.0+rev=d8bc22c"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "foxy"; + repo = "tree-sitter-prolog"; + rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974"; + hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo="; + }; + location = "grammars/prolog"; + meta.homepage = "https://codeberg.org/foxy/tree-sitter-prolog"; + }; promql = buildGrammar { language = "promql"; version = "0.0.0+rev=77625d7"; @@ -2121,12 +2147,12 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=3914005"; + version = "0.0.0+rev=b1e211f"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "391400572538ff9854341a175ed8ab4b1e45f44b"; - hash = "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc="; + rev = "b1e211f52ad8f8e1e182bbbcc16dcd5e3688eb7d"; + hash = "sha256-fgK8UGNaoJf3+lao/q1Vfd+2U/YNgrZu3kbyZ1qOIus="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; @@ -2143,12 +2169,12 @@ }; ralph = buildGrammar { language = "ralph"; - version = "0.0.0+rev=48b9d9d"; + version = "0.0.0+rev=f6d81bf"; src = fetchFromGitHub { owner = "alephium"; repo = "tree-sitter-ralph"; - rev = "48b9d9d6e2b55ce8f9eb09ceb0d952e4b1cc87a0"; - hash = "sha256-Yf2vq7h7UrJmdjQbXU8HM0hjUwwRBFlEV1O+ZUyMIuk="; + rev = "f6d81bf7a4599c77388035439cf5801cd461ff77"; + hash = "sha256-o+h43yMws4utPjqEQCt5swks3KfM3hb4mguclALsUsA="; }; meta.homepage = "https://github.com/alephium/tree-sitter-ralph"; }; @@ -2251,14 +2277,25 @@ }; meta.homepage = "https://github.com/Hubro/tree-sitter-robot"; }; + robots = buildGrammar { + language = "robots"; + version = "0.0.0+rev=8e3a420"; + src = fetchFromGitHub { + owner = "opa-oz"; + repo = "tree-sitter-robots-txt"; + rev = "8e3a4205b76236bb6dbebdbee5afc262ce38bb62"; + hash = "sha256-OePLE85CWbl0hnre4Apq5Ix2GA8juGV2TE891Py4AME="; + }; + meta.homepage = "https://github.com/opa-oz/tree-sitter-robots-txt"; + }; roc = buildGrammar { language = "roc"; - version = "0.0.0+rev=df46a85"; + version = "0.0.0+rev=6ea64b6"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "df46a85abda9f948d38f5d4e3684cec49c42fef2"; - hash = "sha256-4E9ZnMizo+1wnnkYSPNKMkTTyDKRJT+JqtUWoJH45aA="; + rev = "6ea64b6434a45472bd87b0772fd84a017de0a557"; + hash = "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2286,12 +2323,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=dc2d7d6"; + version = "0.0.0+rev=0ffe457"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b"; - hash = "sha256-HV/hJwftBTCj9WomIcLB6n0LcQRHAzlQsJBNOxu6XJo="; + rev = "0ffe457fb6aabf064f173fd30ea356845cef2513"; + hash = "sha256-E46Y++kaipMWZwyfQ40tWj3CTIP25XQ90x2FsQaQ63s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; @@ -2308,12 +2345,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=b76db43"; + version = "0.0.0+rev=599d12b"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "b76db435a7f876cf1ede837d66054c534783c72f"; - hash = "sha256-AZ1YIsnw3x84T2ubwWoekfy98L2GdgQP0R3tM8DEXLM="; + rev = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1"; + hash = "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2353,12 +2390,12 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=865d79e"; + version = "0.0.0+rev=ea77a4d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "865d79e236c7f0e04276c969453d021d1da4b15f"; - hash = "sha256-vZ+Av0lSJaSKUVdEGMtAtXwGIUaIUvS5CvWWfOei/30="; + rev = "ea77a4d91dd93f4483965efcc41f3faebb9131c8"; + hash = "sha256-X+fQoAe9VZekDERw55vz7viXtcVhuZxtAZDYlh4F4Tg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; @@ -2454,12 +2491,12 @@ }; sparql = buildGrammar { language = "sparql"; - version = "0.0.0+rev=05f949d"; + version = "0.0.0+rev=d853661"; src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-sparql"; - rev = "05f949d3c1c15e3261473a244d3ce87777374dec"; - hash = "sha256-KBalxmAukeSbjyelEy+ZqMcBlRd0V0/pntCwTeINTAQ="; + rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58"; + hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU="; }; meta.homepage = "https://github.com/BonaBeavis/tree-sitter-sparql"; }; @@ -2564,12 +2601,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=d657f98"; + version = "0.0.0+rev=631f1e6"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"; - hash = "sha256-KE+qjTP3UWKvcLJPYIJmEGeKBWAdpCzgW4/vIccueng="; + rev = "631f1e66bfbf55791b7a9ed23fa6dc90ee55550a"; + hash = "sha256-/nMRcZc5fWUJ+GpVnlERHjtahXGh6NwrNNQPkNM5Y9E="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2596,6 +2633,17 @@ }; meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap"; }; + systemverilog = buildGrammar { + language = "systemverilog"; + version = "0.0.0+rev=a478beb"; + src = fetchFromGitHub { + owner = "zhangwwpeng"; + repo = "tree-sitter-systemverilog"; + rev = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4"; + hash = "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM="; + }; + meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"; + }; t32 = buildGrammar { language = "t32"; version = "0.0.0+rev=6182836"; @@ -2620,12 +2668,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=034df21"; + version = "0.0.0+rev=91cc49a"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "034df2162ed7b654efd999942e266be713c7cde0"; - hash = "sha256-2+MVrDPuhrM0HE9uRG5LpmyXYy73Pv3MY20UXwBXalM="; + rev = "91cc49a83f4f0b3a756bf7d0e65403a9cf757003"; + hash = "sha256-/u1ZLk9e7uowTnSkxrwXOOmcesqp3uDTRJOshKNc8lQ="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -2654,23 +2702,23 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=cf84ea5"; + version = "0.0.0+rev=a4f14aa"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "cf84ea53e2e2531f23009d676ac206090c1e2392"; - hash = "sha256-CQ11t4beqkjhtZktrawuavgQPSFzbwJrU/aSbPsqBPA="; + rev = "a4f14aa248b84df73cc1c00bf06edac8d7c96acd"; + hash = "sha256-O5eKY9twQJp0qHjIs6juEY0VtOYXAdnlzlomh9YNndI="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; terraform = buildGrammar { language = "terraform"; - version = "0.0.0+rev=422cbe1"; + version = "0.0.0+rev=9e3ec98"; src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; - rev = "422cbe1d93a8ae3847744b664041fc76876babcd"; - hash = "sha256-PrA/F8IIJDzr2HjX9NToApzbM7nO+NesMcKhOQyOyNU="; + rev = "9e3ec9848f28d26845ba300fd73c740459b83e9b"; + hash = "sha256-HM77BXavgP+H3XwHSqRdLlylmkH+idtuZqLeOV2VUiM="; }; location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; @@ -3001,12 +3049,12 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=1e12c79"; + version = "0.0.0+rev=0f06f24"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "1e12c7925c41bb09818d86e30cd78644fde7d31a"; - hash = "sha256-7pntsp8mqXyQK+81FefZv32GNlJsnOWIhvJ9o6Q4FUQ="; + rev = "0f06f24e259ac725045956436b9025dab008ff9f"; + hash = "sha256-/HNDdI2Tg6YG/lAvubZtN2g6pUCk0Kl4kRTRsABIm0Y="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; @@ -3034,23 +3082,23 @@ }; xcompose = buildGrammar { language = "xcompose"; - version = "0.0.0+rev=2383cc6"; + version = "0.0.0+rev=fff3e72"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xcompose"; - rev = "2383cc69a2c42cfade41c7cb971fb3862bec6df1"; - hash = "sha256-N8pJhB35IApb41TKn6NuVMEgmQGC+1Nyu5eQck1K5g8="; + rev = "fff3e72242aa110ebba6441946ea4d12d200fa68"; + hash = "sha256-PNg1z+7CuvpQdksKJOCQ59dZrv4PORdYo6CSw3GrBtk="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=648183d"; + version = "0.0.0+rev=809266e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "648183d86f6f8ffb240ea11b4c6873f6f45d8b67"; - hash = "sha256-O40z5VYmFeE8pkJ85Vu5DWV31YslIrwD80+4qnpoRNY="; + rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; + hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -3101,12 +3149,12 @@ }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=7c5a29b"; + version = "0.0.0+rev=2bac4cc"; src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "7c5a29b721d409be8842017351bf007d7e384401"; - hash = "sha256-UXJCh8GvXzn+sssTrIsLViXD3TiBZhLFABYCKM+fNMQ="; + rev = "2bac4cc6c697d46a193905fef6d003bfa0bfabfd"; + hash = "sha256-IK9kCajZGwEiASa6Mv0oxuz85+QmI3S7Rl9lgHkApMc="; }; meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f2d7640a83e1e..1389a0b5603e8 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -25,7 +25,6 @@ , fzf , gawk , git -, gnome , himalaya , htop , jq @@ -58,6 +57,7 @@ , xorg , xxd , zathura +, zenity , zsh , # codeium-nvim dependencies codeium @@ -79,6 +79,8 @@ , CoreServices , # nvim-treesitter dependencies callPackage +, # Preview-nvim dependencies + md-tui , # sg.nvim dependencies darwin , # sved dependencies @@ -406,12 +408,12 @@ codesnap-nvim = let - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; rev = "refs/tags/v${version}"; - hash = "sha256-nS/bAWsBQ1L4M9437Yp6FdmHoogzalKlLIAXnRZyMp0="; + hash = "sha256-fBeojxvi++3ShqxvFQ5/sv8WbpVrN7+XRPZWWrbpEL4="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; @@ -419,7 +421,7 @@ sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-FTQl5WIGEf+RQKYJ4BbIE3cCeN+NYUp7VXIrpxB05tU="; + cargoHash = "sha256-lDy+FUph4CognY0oN7qhFsbnoC3gxguwq5YVtsiP1lo="; nativeBuildInputs = [ pkg-config @@ -1275,6 +1277,15 @@ nvimRequireCheck = "plenary"; }; + Preview-nvim = super.Preview-nvim.overrideAttrs { + patches = [ + (substituteAll { + src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch; + mdt = lib.getExe md-tui; + }) + ]; + }; + range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = with self; [ cmd-parser-nvim ]; }; @@ -1603,7 +1614,7 @@ vCoolor-vim = super.vCoolor-vim.overrideAttrs { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome.zenity ]; + propagatedBuildInputs = [ zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; diff --git a/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch b/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch new file mode 100644 index 0000000000000..e8082f51c3702 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch @@ -0,0 +1,22 @@ +diff --git a/lua/preview.lua b/lua/preview.lua +index 6d9875d..729cc70 100644 +--- a/lua/preview.lua ++++ b/lua/preview.lua +@@ -28,7 +28,7 @@ local function open_window(file) + vim.env.MDT_WIDTH = width + + vim.cmd.vnew() +- vim.fn.termopen("mdt " .. file) ++ vim.fn.termopen("@mdt@ " .. file) + + vim.cmd("setlocal nonumber norelativenumber") + vim.api.nvim_feedkeys("a", "t", false) +@@ -49,7 +49,7 @@ end + function M.setup() + -- Check if "mdt" is installed + if vim.fn.executable("mdt") == 0 then +- install() ++ -- install() + end + + set_cmd() diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 98f71881c900d..75dd02f39622c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -21,6 +21,7 @@ https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, https://github.com/chrisbra/NrrwRgn/,, https://github.com/vim-scripts/PreserveNoEOL/,, +https://github.com/henriklovhaug/Preview.nvim/,HEAD, https://github.com/yssl/QFEnter/,, https://github.com/chrisbra/Recover.vim/,, https://github.com/vim-scripts/Rename/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 724e9004b29df..bf506f29f79e5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1262,8 +1262,8 @@ let mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "2.4.4"; - hash = "sha256-NJGsMme/+4bvED/93SGojYTH03EZbtKe5LyvocywILA="; + version = "3.0.10"; + hash = "sha256-EVmexnTIQQDmj25/rql3eCfJd47zRui3TpHol6l0Vgs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index 8edde8c3d7334..35ed549fd4188 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-tQjeKqNIhsf2nLdvncH1X6R9HiSTaizBtlAgrfAGtWs="; + hash = "sha256-rRopyjZsQ3N/qPE/r+0ZLfNqcYYMrcY124H3kSx4loE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix index 244abc4f96c78..09e5f4959bac2 100644 --- a/pkgs/applications/emulators/cdemu/analyzer.nix +++ b/pkgs/applications/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { cmake, pkg-config, callPackage, gobject-introspection, wrapGAppsHook3 -, python3Packages, libxml2, gnuplot, gnome, gdk-pixbuf, intltool, libmirage }: +, python3Packages, libxml2, gnuplot, adwaita-icon-theme, gdk-pixbuf, intltool, libmirage }: python3Packages.buildPythonApplication { inherit (callPackage ./common-drv-attrs.nix { @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc="; }) pname version src meta; - buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf ]; + buildInputs = [ libxml2 gnuplot libmirage adwaita-icon-theme gdk-pixbuf ]; propagatedBuildInputs = with python3Packages; [ pygobject3 matplotlib ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index ff2ebd68ca4d1..eb1d533c40f4a 100644 --- a/pkgs/applications/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, cmake, pkg-config, wrapGAppsHook3, gobject-introspection -, python3Packages, libnotify, intltool, gnome, gdk-pixbuf }: +, python3Packages, libnotify, intltool, adwaita-icon-theme, gdk-pixbuf }: python3Packages.buildPythonApplication { inherit (callPackage ./common-drv-attrs.nix { @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication { }) pname version src meta; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ]; - buildInputs = [ libnotify gnome.adwaita-icon-theme gdk-pixbuf ]; + buildInputs = [ libnotify adwaita-icon-theme gdk-pixbuf ]; propagatedBuildInputs = with python3Packages; [ pygobject3 ]; pyproject = false; diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 589a09a6d1054..100ea1d3f9532 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -188,8 +188,6 @@ stdenv.mkDerivation rec { branch = "master"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ - ashkitten - ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index b4698480a962d..95b06b9608572 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ashkitten Madouura ]; + maintainers = with maintainers; [ Madouura ]; broken = stdenv.isDarwin; platforms = platforms.unix; }; diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index 9920e9e77baf1..855e4cd18b3ea 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2024.03.01"; + version = "2024.07.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-EcAp7KyqXdBACEbPgkM1INoKeGVo7hMDUx97y2RcX+k="; + hash = "sha256-mOoOvmsBW6igi5BiLNcmTSKmTeEkBK9WwPu/WKBSJC4="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 708c8db9d3e64..4ab69d9f08212 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -5,10 +5,10 @@ "src": { "owner": "libretro", "repo": "libretro-2048", - "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", - "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + "rev": "5474ed1ab880b3296c9860d0943d7de1970c79dd", + "hash": "sha256-i6bbxsLpSicDDGYKAxTMCMioHHfvBzVokun3PNYgDsc=" }, - "version": "unstable-2023-02-20" + "version": "unstable-2024-06-28" }, "atari800": { "fetcher": "fetchFromGitHub", @@ -35,20 +35,20 @@ "src": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b", - "hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4=" + "rev": "d982616da671c3dd9c9271dd9d95c5c7d1393191", + "hash": "sha256-pAk5uLv5/2n3lZOWp5a5IdPqHM9vLacv8/X6wni5+dE=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-ngp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "673c3d924ff33d71c6a342b170eff5359244df1f", - "hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY=" + "rev": "09869bb6032610714e22d09b95a81ea291937a8f", + "hash": "sha256-chMtMPUMHQ0iVcERfQApKnGQmV822QkYce2wvSj2Uck=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-pce": { "fetcher": "fetchFromGitHub", @@ -65,30 +65,30 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9", - "hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c=" + "rev": "9ebf08571e20e79db32be78a025a8b552e9a3795", + "hash": "sha256-iE81/8RMkCaJuFOMSfZzCC7BFOFBv/0cNpcJRuQC0ws=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-28" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", - "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" + "rev": "94541ff5bf9c474aa2923fed3afc4297678c9ede", + "hash": "sha256-+E09lQmogRvLc+6TzI0FNfu18jRdZMOzEYJnQjYuldI=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-06-28" }, "beetle-psx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4", - "hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8=" + "rev": "6f0ef7be0a023842b98ab5a8e7c7b5e4b2c31573", + "hash": "sha256-5jYDNuW0XjWTHTEEUkxK0DnQgvH2dZLUot/lmix05hk=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-29" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,30 +115,30 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d", - "hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc=" + "rev": "0e6ce96d68c1565d1cfb2d64841970f19f3cfb66", + "hash": "sha256-4LEvzyIpWBH0jfTuJaRxYe1fKdrw7/Mes6UlkxNyS58=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-06-28" }, "beetle-vb": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "9d1bd03f21dac7897f65269e1095496331efce8b", - "hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU=" + "rev": "4395c809d407c8b5a80b0d0ee87783aad5fedf8f", + "hash": "sha256-lO4tbJeQIZPGhW0Ew0BOcfbwNeV+yR8PTZ/RyCIt14s=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "beetle-wswan": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "32bf70a3032a138baa969c22445f4b7821632c30", - "hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU=" + "rev": "440e9228592a3f603d7d09e8bee707b0163f545f", + "hash": "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "blastem": { "fetcher": "fetchFromGitHub", @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "1e3cb35355769467ca7be192e740eb9728ecc88c", - "hash": "sha256-svVpHUOPPAFMypmeaHLCQfwTAVOZajTMKyeKvWLZlcc=" + "rev": "00e3ed7e361afbab03363e493f5aa643e0bb2577", + "hash": "sha256-w57U5W4m8AZFujiY3L2uUFZQ7NsRzMU9NRPUerJk/9A=" }, - "version": "unstable-2024-06-03" + "version": "unstable-2024-06-29" }, "easyrpg": { "fetcher": "fetchFromGitHub", @@ -267,10 +267,10 @@ "src": { "owner": "libretro", "repo": "81-libretro", - "rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d", - "hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk=" + "rev": "c0d56c5bc5cd48715b4e83cbb3d241a6bed94c2a", + "hash": "sha256-XkXZlH359NtOemkArSc1+UXhU55W3hVeM7zH/LRr1zo=" }, - "version": "unstable-2023-11-01" + "version": "unstable-2024-06-28" }, "fbalpha2012": { "fetcher": "fetchFromGitHub", @@ -297,10 +297,10 @@ "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f", - "hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s=" + "rev": "9e685cda1372204048d831ef5976972dfb2dc541", + "hash": "sha256-O+FEHPuXybyMCMdvm9UdrZvl5K1yiFx2HIyhN3AuyVo=" }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-06-28" }, "flycast": { "fetcher": "fetchFromGitHub", @@ -318,10 +318,10 @@ "src": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", - "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=" + "rev": "cf97a3c6da07d5f8e98c90c907ad987ffea432e0", + "hash": "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA=" }, - "version": "unstable-2024-02-08" + "version": "unstable-2024-06-28" }, "freeintv": { "fetcher": "fetchFromGitHub", @@ -348,50 +348,50 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "594422484170a0a075d02d702d3367819c9d4e1a", - "hash": "sha256-pCoQ+9Sx4dBhbnJTQ00nJAb8ooUp/6pVxTdGtL2tX0c=" + "rev": "5d47507d3e25354478b216111b30741868d0362b", + "hash": "sha256-PkvV3ALtC53v+Te9lGuUWeOfXr8CZSxCdClgS59vpns=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-06-29" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "3bf89541aca5768cda7f834e5c5a6041fd4a5f27", - "hash": "sha256-s8MmlcPdnS6esSWS3GD53X7UzwP2RNjtL3QYnPbgStQ=" + "rev": "5355eae2e1c70893a14ec0fda68de4e49cd5a0d5", + "hash": "sha256-134J1ifF9EOaPk6qqANdJawVtoa1M91Bc5jqxA0hMOM=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-06-29" }, "gpsp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gpsp", - "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", - "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=" + "rev": "bfbdfda215889cad5ae314bd5221d773a343b5bd", + "hash": "sha256-l3hr5c7kIgr7Rjfneai6cTpUswMpba51TlZSSreQkyE=" }, - "version": "unstable-2024-02-10" + "version": "unstable-2024-06-28" }, "gw": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gw-libretro", - "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", - "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=" + "rev": "feab76c102166784230dc44c45cad4cb49a1c9a7", + "hash": "sha256-dtcsPTemFqgfBtFp4RF0Q2B/3bCHY4CqJGibwV+lfwI=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-06-28" }, "handy": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-handy", - "rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48", - "hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA=" + "rev": "15d3c87e0eba52464ed759d3702d7cb7fdd0d7e0", + "hash": "sha256-aebQGTGYF1jlZdSzb3qQ6PIyQZ00hEKfH6W6pYYQUBw=" }, - "version": "unstable-2024-01-01" + "version": "unstable-2024-06-28" }, "hatari": { "fetcher": "fetchFromGitHub", @@ -429,20 +429,20 @@ "src": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "ce82eaa30932c988e9d9abc0ac5d6d637fb88cc6", - "hash": "sha256-vCqv2EhgYtJwNE2sRcs8KTg0cGlRSmhykRLkt8mUKlg=" + "rev": "c8f28b100851fa850e2be3b8b30e2839a2d175cc", + "hash": "sha256-IQ6s6mOMMHX8GjNNfc0pZFjSZyJurpm40FHcyErfOPM=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-29" }, "mame2003-plus": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "ecd00b18187c7fff75b6d9a70ac1b349e79652bb", - "hash": "sha256-1dVNNlDKDJwGHou/bY/grj/p9BJmfUwDxEiw2zQ7gSg=" + "rev": "015fbd88bfd92c3847749fee01e8725f53c007ef", + "hash": "sha256-6wzi/r9bBKzxMmXQ4mHSzlnI5D9l87BuhHwM7HTvGr4=" }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-30" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -540,10 +540,10 @@ "src": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "5d2ac21adb784ad72d6101290117702eef0411dd", - "hash": "sha256-PKjnoTioAvCYv2JBiPMXR4QZUgPeSQ3V4cB7mp2fqeI=" + "rev": "147dc7e552b84d5c51d09108fa5ada0268710170", + "hash": "sha256-qsjoal3r/4QRJ0B5FcupZBhf9gyeIfok5cxsjeNJhrM=" }, - "version": "unstable-2024-05-21" + "version": "unstable-2024-06-28" }, "neocd": { "fetcher": "fetchFromGitHub", @@ -560,10 +560,10 @@ "src": { "owner": "libretro", "repo": "nestopia", - "rev": "1fc8c32b91c64aed056fa6d26359f1831c455c70", - "hash": "sha256-LjdIOcwzWRSQTxJeWsQzGuYGOUsPycNzURoG029zpHk=" + "rev": "be1139ec4d89151fc65b81a3494d2b9c0fd0b7dc", + "hash": "sha256-8MoEYcywnqNtn4lntp8WcIYMTzKhaHkHyDMHMhHHxxg=" }, - "version": "unstable-2024-06-22" + "version": "unstable-2024-06-28" }, "np2kai": { "fetcher": "fetchFromGitHub", @@ -581,20 +581,20 @@ "src": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", - "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" + "rev": "11fc0892dc6b99b36ecf318006834932cd5b817a", + "hash": "sha256-PlU3op50yPgDUXZxSOlltMf/30JLrotpp61UHK1uKB8=" }, - "version": "unstable-2023-02-21" + "version": "unstable-2024-06-28" }, "o2em": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "44fe5f306033242f7d74144105e19a7d4939477e", - "hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs=" + "rev": "c8f458d035392963823fbb50db0cec0033d9315f", + "hash": "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U=" }, - "version": "unstable-2023-10-19" + "version": "unstable-2024-06-28" }, "opera": { "fetcher": "fetchFromGitHub", @@ -631,21 +631,21 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409", - "hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0=" + "rev": "459f02ad03fa10b5c403fed724d47fe5adfd5fb1", + "hash": "sha256-bM2o6ukVXyrH9QnczHUtZCLu6Kwl6Gc9DriLvVHJmXw=" }, - "version": "unstable-2024-06-17" + "version": "unstable-2024-06-29" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "535217f16bc2848ec70985c41e1d131709352641", - "hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=", + "rev": "d6f625a1251c78caf6f2dc81c1ffdb724587bb24", + "hash": "sha256-3RjPYXVfv1ts8Khl/9hkWMdYalNoQmHb+S8xgNfstpo=", "fetchSubmodules": true }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-06-30" }, "play": { "fetcher": "fetchFromGitHub", @@ -663,31 +663,31 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "2a3aaed71135d9574f002073ceae74356b29c900", - "hash": "sha256-WU48YrRUWaJi1xcHRxP7JigaJZ8Vbm/v4w9LdD5TvLo=", + "rev": "c737eca1a7a0628523bcf710e2fa0a4288c31352", + "hash": "sha256-RSPyxhw27qL7FMgNqoGLGRiVue+BPB/huA2SvMMES+w=", "fetchSubmodules": true }, - "version": "unstable-2024-06-24" + "version": "unstable-2024-06-29" }, "prboom": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "9d412db570d3291829b308e6d1ac17f04acdda17", - "hash": "sha256-50Nl8IyaQRLOQtTRYhJFwTH8ojMxNVVn/c+oGCeJts0=" + "rev": "2972aa92e0490194a37c9fb849ffc420abeb0ce4", + "hash": "sha256-VXrhSZpGNjfxU34b2gzxaPe0YKXv4K7+vB7MrC7/bkY=" }, - "version": "unstable-2024-05-23" + "version": "unstable-2024-06-28" }, "prosystem": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", - "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=" + "rev": "a639359434cde73e6cdc651763afc587c1afb678", + "hash": "sha256-rcn1puMQXCKogONe2oUpcDEj8S6/oVRcuWLDkinZgnk=" }, - "version": "unstable-2023-08-17" + "version": "unstable-2024-06-28" }, "puae": { "fetcher": "fetchFromGitHub", @@ -724,10 +724,10 @@ "src": { "owner": "libretro", "repo": "sameboy", - "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", - "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" + "rev": "51433012a871a44555492273fd22f29867d12655", + "hash": "sha256-vPT2uRGbXmJ62yig/yk485/TxEEKHJeWdNrM2c0IjKw=" }, - "version": "unstable-2022-08-19" + "version": "unstable-2024-06-28" }, "scummvm": { "fetcher": "fetchFromGitHub", @@ -774,10 +774,10 @@ "src": { "owner": "libretro", "repo": "snes9x2005", - "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", - "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" + "rev": "285220ed696ec661ce5c42856e033a1586fda967", + "hash": "sha256-jKRu93zw6U9OYn35zXYJH/xCiobsZdzWROge7+sKh6M=" }, - "version": "unstable-2022-07-25" + "version": "unstable-2024-06-28" }, "snes9x2010": { "fetcher": "fetchFromGitHub", @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "9381a67604a81a5ddfc931581ba7ba53bc7680cb", - "hash": "sha256-TLLUCRYy6G0ylQKZEiaUPBCkjOAEJRmTI3s7xWPGgiA=" + "rev": "69b300b6f9d46c4f9caa2df1f848a74163cd1173", + "hash": "sha256-8TgbZzmuwDUn23zR1/XKIOdrLwgzq18oMS1KOhSs1oQ=" }, - "version": "unstable-2024-06-23" + "version": "unstable-2024-06-30" }, "stella2014": { "fetcher": "fetchFromGitHub", @@ -814,10 +814,10 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "7a27436548128c00e70b08dde63c52118e2a6228", - "hash": "sha256-u7D044lKNAH4aAaY/Ol7BR3dNeusX4wirIMdUEGw2oM=" + "rev": "8a999111ff3b8e40dd093c214dd56ba1596e1115", + "hash": "sha256-H9NWRbtqc+Zx/cBtS6LAbL6DsTLeDGGXhRRBD5W5tHg=" }, - "version": "unstable-2024-05-30" + "version": "unstable-2024-06-29" }, "tgbdual": { "fetcher": "fetchFromGitHub", @@ -855,30 +855,30 @@ "src": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", - "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=" + "rev": "b5a4788747fa46afe681080db758f4a827ff7274", + "hash": "sha256-R/WaUiVlRbytra/jJyZZvkDbmnZvsO4RLFYYTp5Rcvo=" }, - "version": "unstable-2023-08-18" + "version": "unstable-2024-06-28" }, "vba-next": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "vba-next", - "rev": "ee92625d2f1666496be4f5662508a2430e846b00", - "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=" + "rev": "2c726f25da75a5600ef5791ce904befe06c4dddd", + "hash": "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs=" }, - "version": "unstable-2023-06-03" + "version": "unstable-2024-06-28" }, "vecx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "3a5655ff67e161ef33f66b0f6c26aaf2e59ceda8", - "hash": "sha256-NGZo1bUGgw4YMyyBfTsvXPQG/P130mkXzt4GXE/yatU=" + "rev": "0e48a8903bd9cc359da3f7db783f83e22722c0cf", + "hash": "sha256-lB8NSaxDbN2qljhI0M/HFDuN0D/wMhFUQXhfSdGHsHU=" }, - "version": "unstable-2024-03-17" + "version": "unstable-2024-06-28" }, "virtualjaguar": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 9abb44fd61a4e..8082194500cc8 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.11"; + version = "9.12"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; + hash = "sha256-CRRa5yCy+fGBh5cLoGQLvzztWujceK8dfVf1B37CavY="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -88,9 +88,9 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "9.1.0"; + version = "9.2.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-igoeaDe0lN9Jkn5ddZscaQjom4ovjjrQJeHCiBiCR24="; + hash = "sha256-/VgpJE2SmFuKQEdFrd21jDqbC7ttVMpMbq+G6kZnNfk="; }; updateScript = writeShellScript "update-wine-unstable" '' @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-vqlikMatRlGxvWJ6BJu2HyBclV4x+vzNPNe8py7jKqo="; + hash = "sha256-lvjuohEo4pwCAd1KmLjUBakS5gSN+Ic6+QQ18sS3axw="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix index 5c614fdede9f2..3e8d22a65b8d0 100644 --- a/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/pkgs/applications/file-managers/pcmanfm/default.nix @@ -8,7 +8,7 @@ , pango , pkg-config , wrapGAppsHook3 -, gnome +, adwaita-icon-theme , withGtk3 ? true , gtk2 , gtk3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; + buildInputs = [ glib gtk libfm' libX11 pango adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 2bd13de7d5d63..e9ab276606055 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, adwaita-icon-theme , xorg, mozjpeg, makeWrapper, wrapGAppsHook3, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [makeWrapper wrapGAppsHook3 unzip]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 05fb56bb5d7d7..111e37711ef30 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-RlsiN9pefpTYUh4M8j4Ty/Ipi9StoVcNcICd7QDirhI="; + hash = "sha256-NiQYX/Dcl/t30Jx08DKr6EP5ODS00pyEGKh/qiNT5t4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 362de3633ab25..561a365b56210 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -38,7 +38,7 @@ , colord-gtk , libwebp , libsecret -, gnome +, adwaita-icon-theme , SDL2 , ocl-icd , pcre @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { libwebp libsecret SDL2 - gnome.adwaita-icon-theme + adwaita-icon-theme osm-gps-map pcre isocodes diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 448b371d2ca91..4ad76a3d98d99 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.6.1"; + version = "24.6.4"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-trBSNE5OBBNq18Dn/IwhHpD3ZQ7C5venwsBtyZxv+2k="; + hash = "sha256-6+a+70uN4Tk4pMXg3DQ3D0GcLNGFQEcPG05xxyUv1DQ="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-9Hq08DXEiOK0P+x89Gl3Y2+dN5r7aS7GNrCSVDGMpFs="; + hash = "sha256-R8eCnp/ik3EfsmsVyJfLjyScUVQSm/EdXJesS/eVIX0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 0522879d9d3e1..3bdb37900de0b 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -2,10 +2,14 @@ , lib , mkDerivation , fetchFromGitHub +, cargo , extra-cmake-modules +, rustc +, rustPlatform # common deps , karchive +, qtwebsockets # client deps , qtbase @@ -20,7 +24,6 @@ , kdnssd , libvpx , miniupnpc -, qtx11extras # kis # optional server deps , libmicrohttpd @@ -33,10 +36,10 @@ , buildServer ? true , buildServerGui ? true # if false builds a headless server , buildExtraTools ? false -, enableKisTablet ? false # enable improved graphics tablet support }: -with lib; +assert lib.assertMsg (buildClient || buildServer || buildExtraTools) + "You must specify at least one of buildClient, buildServer, or buildExtraTools."; let clientDeps = [ @@ -57,54 +60,57 @@ let # optional: libmicrohttpd # HTTP admin api libsodium # ext-auth support - ] ++ optional withSystemd systemd; - - kisDeps = [ - qtx11extras - ]; - - boolToFlag = bool: - if bool then "ON" else "OFF"; + ] ++ lib.optional withSystemd systemd; in mkDerivation rec { pname = "drawpile"; - version = "2.1.20"; + version = "2.2.1"; src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; rev = version; - sha256 = "sha256-HjGsaa2BYRNxaQP9e8Z7BkVlIKByC/ta92boGbYHRWQ="; + sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM="; }; - nativeBuildInputs = [ extra-cmake-modules ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-V36yiwraXK7qlJd1r8EtEA4ULxlgvMEmpn/ka3m9GjA="; + }; + + nativeBuildInputs = [ + cargo + extra-cmake-modules + rustc + rustPlatform.cargoSetupHook + ]; buildInputs = [ karchive + qtwebsockets ] - ++ optionals buildClient clientDeps - ++ optionals buildServer serverDeps - ++ optionals enableKisTablet kisDeps; + ++ lib.optionals buildClient clientDeps + ++ lib.optionals buildServer serverDeps; cmakeFlags = [ - "-Wno-dev" - "-DINITSYS=systemd" - "-DCLIENT=${boolToFlag buildClient}" - "-DSERVER=${boolToFlag buildServer}" - "-DSERVERGUI=${boolToFlag buildServerGui}" - "-DTOOLS=${boolToFlag buildExtraTools}" - "-DKIS_TABLET=${boolToFlag enableKisTablet}" + (lib.cmakeFeature "INITSYS" (lib.optionalString withSystemd "systemd")) + (lib.cmakeBool "CLIENT" buildClient) + (lib.cmakeBool "SERVER" buildServer) + (lib.cmakeBool "SERVERGUI" buildServerGui) + (lib.cmakeBool "TOOLS" buildExtraTools) ]; meta = { description = "Collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; - mainProgram = "drawpile-srv"; homepage = "https://drawpile.net/"; downloadPage = "https://drawpile.net/download/"; - license = licenses.gpl3; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.unix; broken = stdenv.isDarwin; + } // lib.optionalAttrs buildServer { + mainProgram = "drawpile-srv"; + } // lib.optionalAttrs buildClient { + mainProgram = "drawpile"; }; } - diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f4adcace1ec43..bc27d93db6670 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feh"; - version = "3.10.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "derf"; repo = "feh"; rev = finalAttrs.version; - hash = "sha256-378rhZhpcua3UbsY0OcGKGXdMIQCuG84YjJ9vfJhZVs="; + hash = "sha256-FtaFoLjI3HTLAxRTucp5VDYS73UuWqw9r9UWKK6T+og="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4eeb330f6d27e..3c44ae0bddf1e 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,7 +2,7 @@ , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp -, gphoto2, imagemagick, yad, exiftool, gnome, libnotify +, gphoto2, imagemagick, yad, exiftool, zenity, libnotify , wrapGAppsHook3, fetchpatch, doxygen , nix-update-script }: @@ -56,18 +56,18 @@ stdenv.mkDerivation rec { # Allow to crop image. # Requires imagemagick, exiv2 and exiftool. sed -i $out/lib/geeqie/geeqie-image-crop \ - -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool gnome.zenity ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool zenity ]}:$PATH' # Requires gphoto2 and libnotify sed -i $out/lib/geeqie/geeqie-tethered-photography \ - -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity libnotify ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity libnotify ]}:$PATH' # Import images from camera. # Requires gphoto2. sed -i $out/lib/geeqie/geeqie-camera-import \ - -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 zenity ]}:$PATH' # Export jpeg from raw file. # Requires exiv2, exiftool and lcms2. sed -i $out/lib/geeqie/geeqie-export-jpeg \ - -e '1 a export PATH=${lib.makeBinPath [ gnome.zenity exiv2 exiftool lcms2 ]}:$PATH' + -e '1 a export PATH=${lib.makeBinPath [ zenity exiv2 exiftool lcms2 ]}:$PATH' ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 5b92093005e09..f2400aca0fd1f 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome, plugins ? null}: +{ lib, symlinkJoin, makeWrapper, gimpPlugins, gnome-themes-extra, plugins ? null}: let inherit (gimpPlugins) gimp; @@ -19,7 +19,7 @@ in symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 461e1882d3780..f5e026c75b711 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, autoreconfHook +{ lib, stdenv, fetchurl, fetchpatch, barcode, gnome, gnome-common, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools, qrencode }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools - gnome.gnome-common gsettings-desktop-schemas + gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool qrencode ]; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 6aaf257496cd9..915a9966ef2c7 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, wrapGAppsHook3, fetchpatch, +{ lib, fetchurl, perlPackages, wrapGAppsHook3, # libs librsvg, sane-backends, sane-frontends, # runtime dependencies @@ -10,20 +10,14 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.13.2"; + version = "2.13.3"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - hash = "sha256-NGz6DUa7TdChpgwmD9pcGdvYr3R+Ft3jPPSJpybCW4Q="; + hash = "sha256-QAs6fsQDe9+nKM/OAVZUHB034K72jHsKoA2LY2JQa8Y="; }; patches = [ - # fixes warnings during tests. See https://sourceforge.net/p/gscan2pdf/bugs/421 - (fetchpatch { - name = "0001-Remove-given-and-when-keywords-and-operator.patch"; - url = "https://sourceforge.net/p/gscan2pdf/bugs/_discuss/thread/602a7cedfd/1ea4/attachment/0001-Remove-given-and-when-keywords-and-operator.patch"; - hash = "sha256-JtrHUkfEKnDhWfEVdIdYVlr5b/xChTzsrrPmruLaJ5M="; - }) # fixes an error with utf8 file names. See https://sourceforge.net/p/gscan2pdf/bugs/400 ./image-utf8-fix.patch ]; @@ -113,18 +107,6 @@ perlPackages.buildPerlPackage rec { ]); checkPhase = '' - # Temporarily disable a test failing after a patch imagemagick update. - # It might only due to the reporting and matching used in the test. - # See https://github.com/NixOS/nixpkgs/issues/223446 - # See https://sourceforge.net/p/gscan2pdf/bugs/417/ - # - # Failed test 'valid TIFF created' - # at t/131_save_tiff.t line 44. - # 'test.tif TIFF 70x46 70x46+0+0 8-bit sRGB 10024B 0.000u 0:00.000 - # ' - # doesn't match '(?^:test.tif TIFF 70x46 70x46\+0\+0 8-bit sRGB [7|9][.\d]+K?B)' - rm t/131_save_tiff.t - # Temporarily disable a dubiously failing test: # t/169_import_scan.t ........................... 1/1 # # Failed test 'variable-height scan imported with expected size' @@ -135,12 +117,17 @@ perlPackages.buildPerlPackage rec { # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) rm t/169_import_scan.t - # Disable a test which passes but reports an incorrect status - # t/0601_Dialog_Scan.t .......................... All 14 subtests passed - # t/0601_Dialog_Scan.t (Wstat: 139 Tests: 14 Failed: 0) - # Non-zero wait status: 139 - rm t/0601_Dialog_Scan.t - + # Disable a test failing because of a warning interfering with the pinned output + # t/3722_user_defined.t ......................... 1/2 + # Failed test 'user_defined caught error injected in queue' + # at t/3722_user_defined.t line 41. + # got: 'error + # WARNING: The convert command is deprecated in IMv7, use "magick" instead of "convert" or "magick convert"' + # expected: 'error' + # Looks like you failed 1 test of 2. + rm t/3722_user_defined.t + + export XDG_CACHE_HOME="$(mktemp -d)" xvfb-run -s '-screen 0 800x600x24' \ make test ''; diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index c3468f65dcab6..f0869bca596df 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM="; + sha256 = "sha256-3CvPJLenEVpTLNZUj+TG1cEfyWGmtaPZH/FD/AgK1io="; }; # needed for wrapGAppsHook3 to function diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index fc59139694515..7de0541955206 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -5,6 +5,7 @@ , pkg-config , meson , ninja +, adwaita-icon-theme , exiv2 , libheif , libjpeg @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { clutter-gtk exiv2 glib - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 9bfc5d7aec191..35ec592d24cc5 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -19,7 +19,7 @@ , libXrender , libXxf86vm , libglvnd -, gnome +, zenity }: let @@ -39,7 +39,7 @@ let ]; runBinDeps = [ - gnome.zenity + zenity ]; in @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { description = "Real-time GPU shader editor"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ prusnak lilyinstarlight ]; + maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; mainProgram = "KodeLife"; }; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 20ff949a35402..a0ad2ab676dbb 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... }: callPackage ./generic.nix { - version = "5.2.2"; + version = "5.2.3"; kde-channel = "stable"; - hash = "sha256-wdLko219iqKW0CHlK+STzGedP+Xoqk/BPENNM+gVTOI="; + hash = "sha256-RmpG7bk8PjetZSB8+WAjSJCnJ0Tg9E8shV3kx9iCXMA="; } diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index ff859b4ed7ed9..b781bedd084fe 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -28,12 +28,6 @@ mkDerivation rec { url = "https://invent.kde.org/graphics/krita/-/commit/2d71c47661d43a4e3c1ab0c27803de980bdf2bb2.diff"; hash = "sha256-U3E44nj4vra++PJV20h4YHjES78kgrJtr4ktNeQfOdA="; }) - # Fixes build with libjxl 0.9.0 - (fetchpatch { - name = "fix-build-with-libjxl-0.9.0.patch"; - url = "https://invent.kde.org/graphics/krita/-/commit/ace7edcca6ad322581ab39620f21ccf3ffbd3b5a.diff"; - hash = "sha256-dXk4+HNS0+Ie/8V4+Oj4rBJrJbNHG57gIzPymXLEc9M="; - }) ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip ]; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 19455d89c930b..78b6f2d3f5683 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.6.00"; + version = "1.6.03"; nativeBuildInputs = [ p7zip @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-R9DBlmqvV23QXzC45Z4GN0t+ysv4WM63POJGU5N7jbw="; + sha256 = "sha256-yMxCe9Bu5llAUrTLG8R+1HX65rs9fhhoVG79vxDzeWY="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 844878a34959d..803d298ddfd7e 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -3,6 +3,7 @@ , fetchurl , meson , ninja +, adwaita-icon-theme , gtk3 , libexif , libgphoto2 @@ -37,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.6"; + version = "0.32.7"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY="; + sha256 = "sha256-EvMl4BnD5jjCuWFXG8IEd2dh6CYUZ+8btodViJM11fc="; }; nativeBuildInputs = [ @@ -80,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { librsvg librest gcr - gnome.adwaita-icon-theme + adwaita-icon-theme libsecret libportal-gtk3 ]; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 9f18033fca487..fe4286aa4b5b1 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -15,8 +15,6 @@ let perlModules = with perlPackages; [ - # Not sure if these are needed - # Gnome2 Gnome2Canvas Gnome2VFS Gtk2AppIndicator Gtk2Unique ImageMagick Cairo FileBaseDir diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index f1edfe81fb638..c20f10ee0d1bd 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -19,7 +19,7 @@ , pango , imagemagick , intltool -, gnome +, adwaita-icon-theme , harfbuzz , freetype , fribidi @@ -131,7 +131,7 @@ stdenv.mkDerivation { libsigcxx libxmlxx mlt - gnome.adwaita-icon-theme + adwaita-icon-theme openexr fftw ]; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 288eb7aef6ca6..76c8b7f692af9 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, wrapGAppsHook3 -, libX11, libzip, glfw, libpng, xorg, gnome +, libX11, libzip, glfw, libpng, xorg, zenity }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH ":" "${gnome.zenity}/bin" + --prefix PATH ":" "${zenity}/bin" ''; env.CXXFLAGS = "-include cstdint"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 3599cf70032a5..ee4030053b677 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.23.2"; + version = "3.24"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI="; + sha256 = "sha256-4aotsOippuKUucweWERtqm/5pz2gwW1Sue48KPisQ0I="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook3 ]; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index d4430ac9e0662..0c4193aa2e5dd 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-vlap8gTZYoQS70Co99bZ16Fv9eq1N3rH7skjwrLDWiM="; + sha256 = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index ed1900836fccc..02d15b5068722 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -1,12 +1,12 @@ -{ lib -, appimageTools -, fetchurl +{ + lib, + appimageTools, + fetchurl, + makeWrapper, }: - -appimageTools.wrapAppImage rec { +let pname = "bazecor"; version = "1.3.11"; - src = appimageTools.extract { inherit pname version; src = fetchurl { @@ -18,11 +18,14 @@ appimageTools.wrapAppImage rec { postExtract = '' substituteInPlace \ $out/usr/lib/bazecor/resources/app/.webpack/main/index.js \ - --replace \ + --replace-fail \ 'checkUdev=()=>{try{if(c.default.existsSync(f))return c.default.readFileSync(f,"utf-8").trim()===l.trim()}catch(e){console.error(e)}return!1}' \ 'checkUdev=()=>{return 1}' ''; }; +in +appimageTools.wrapAppImage { + inherit pname version src; # also make sure to update the udev rules in ./10-dygma.rules; most recently # taken from @@ -35,14 +38,18 @@ appimageTools.wrapAppImage rec { # to allow non-root modifications to the keyboards. extraInstallCommands = '' - install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications - substituteInPlace $out/share/applications/Bazecor.desktop \ - --replace 'Exec=Bazecor' 'Exec=bazecor' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/bazecor \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${src}/Bazecor.desktop -t $out/share/applications install -m 444 -D ${src}/bazecor.png -t $out/share/pixmaps mkdir -p $out/lib/udev/rules.d - ln -s --target-directory=$out/lib/udev/rules.d ${./10-dygma.rules} + install -m 444 -D ${./10-dygma.rules} $out/lib/udev/rules.d/10-dygma.rules + + substituteInPlace $out/share/applications/Bazecor.desktop \ + --replace-fail 'Exec=Bazecor' 'Exec=bazecor' ''; meta = { @@ -51,7 +58,10 @@ appimageTools.wrapAppImage rec { changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ amesgen ]; + maintainers = with lib.maintainers; [ + amesgen + gcleroux + ]; platforms = [ "x86_64-linux" ]; mainProgram = "bazecor"; }; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index d017f4306fe73..021b793015fff 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; mainProgram = "bemenu"; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0e19d15973651..e1bf6cffb008d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -21,12 +21,13 @@ , qmake , qtbase , qtwayland -, removeReferencesTo , speechd , sqlite , wrapQtAppsHook , xdg-utils , wrapGAppsHook3 +, popplerSupport ? true +, speechSupport ? true , unrarSupport ? false }: @@ -69,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config qmake - removeReferencesTo wrapGAppsHook3 wrapQtAppsHook ]; @@ -91,48 +91,48 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtwayland sqlite + (python3Packages.python.withPackages + (ps: with ps; [ + (apsw.overrideAttrs (oldAttrs: { + setupPyBuildFlags = [ "--enable=load_extension" ]; + })) + beautifulsoup4 + css-parser + cssselect + python-dateutil + dnspython + faust-cchardet + feedparser + html2text + html5-parser + lxml + markdown + mechanize + msgpack + netifaces + pillow + pychm + pyqt-builder + pyqt6 + python + regex + sip + setuptools + zeroconf + jeepney + pycryptodome + xxhash + # the following are distributed with calibre, but we use upstream instead + odfpy + ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ + # much of calibre's functionality is usable without a web + # browser, so we enable building on platforms which qtwebengine + # does not support by simply omitting qtwebengine. + pyqt6-webengine + ] ++ lib.optional (unrarSupport) unrardll) + ) xdg-utils - ] ++ ( - with python3Packages; [ - (apsw.overrideAttrs (oldAttrs: { - setupPyBuildFlags = [ "--enable=load_extension" ]; - })) - beautifulsoup4 - css-parser - cssselect - python-dateutil - dnspython - faust-cchardet - feedparser - html2text - html5-parser - lxml - markdown - mechanize - msgpack - netifaces - pillow - pychm - pyqt-builder - pyqt6 - python - regex - sip - setuptools - speechd - zeroconf - jeepney - pycryptodome - xxhash - # the following are distributed with calibre, but we use upstream instead - odfpy - ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [ - # much of calibre's functionality is usable without a web - # browser, so we enable building on platforms which qtwebengine - # does not support by simply omitting qtwebengine. - pyqt6-webengine - ] ++ lib.optional (unrarSupport) unrardll - ); + ] ++ lib.optional (speechSupport) speechd; installPhase = '' runHook preInstall @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" - ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py install --root=$out \ + python setup.py install --root=$out \ --prefix=$out \ --libdir=$out/lib \ --staging-root=$out \ @@ -173,23 +173,18 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; dontWrapGApps = true; - # Remove some references to shrink the closure size. This reference (as of - # 2018-11-06) was a single string like the following: - # /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-podofo-0.9.6-dev/include/podofo/base/PdfVariant.h - preFixup = '' - remove-references-to -t ${podofo.dev} \ - $out/lib/calibre/calibre/plugins/podofo.so - - for program in $out/bin/*; do - wrapProgram $program \ - ''${qtWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix PATH : ${poppler_utils.out}/bin - done - ''; - - disallowedReferences = [ podofo.dev ]; + preFixup = + let + popplerArgs = "--prefix PATH : ${poppler_utils.out}/bin"; + in + '' + for program in $out/bin/*; do + wrapProgram $program \ + ''${qtWrapperArgs[@]} \ + ''${gappsWrapperArgs[@]} \ + ${if popplerSupport then popplerArgs else ""} + done + ''; meta = { homepage = "https://calibre-ebook.com"; diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index ce23411258420..8a8bf8ad5812c 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.23.0"; + version = "5.25.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-x63UMIl0Wsr4qSEn19Of135PHKlpEVAZzhA2+ZjxNwY="; + hash = "sha256-4YeeeIC37s/cXZ4TjIxn/yvDVKP92f9uSBajLCj7NZw="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 2f73d2d8dee41..96f19b47968aa 100644 --- a/pkgs/applications/misc/collision/default.nix +++ b/pkgs/applications/misc/collision/default.nix @@ -5,7 +5,7 @@ , wrapGAppsHook4 , desktopToDarwinBundle , gobject-introspection -, gnome +, nautilus-python , python3 , libadwaita , openssl @@ -54,7 +54,7 @@ crystal.buildCrystalPackage rec { libadwaita openssl libxml2 - gnome.nautilus-python + nautilus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 1172571488838..022416c37611f 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.0"; + version = "1.27.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-zMimHjaXgwOSt8HbSec4o0y3e9Xf6tFFiI4KzsrP850="; + hash = "sha256-S1RF0FNJ/oKTwq9SXXIOnqBIViGIYBVuxPjV/6fbeV8="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index daaf92fc72de2..a04cf4ec7c773 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -7,7 +7,7 @@ , ninja , vala , pkg-config -, gnome +, adwaita-icon-theme , libchamplain , gdl , wrapGAppsHook3 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdl libchamplain - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix index 6666a63ca1ed9..769b44204420c 100644 --- a/pkgs/applications/misc/inochi2d/generic.nix +++ b/pkgs/applications/misc/inochi2d/generic.nix @@ -13,7 +13,7 @@ dbus, freetype, SDL2, - gnome, + zenity, builderArgs, }: @@ -126,7 +126,7 @@ buildDubPackage ( postFixup = '' # Add support for `open file` dialog makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \ - --prefix PATH : ${lib.makeBinPath [ gnome.zenity ]} + --prefix PATH : ${lib.makeBinPath [ zenity ]} ''; meta = { diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index b4ea7d829a3ec..9a50ac48740b3 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Only; mainProgram = "j4-dmenu-desktop"; maintainers = with maintainers; [ ericsagnes ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index a7260dc509b72..33ebb9e329f25 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -13,7 +13,7 @@ , nss , udev , xorg -, gnome +, gnome-keyring , mesa , gtk3 , libusb1 @@ -54,7 +54,7 @@ let xorg.libXScrnSaver xorg.libXtst xorg.libxshmfence - gnome.gnome-keyring + gnome-keyring mesa gtk3 libusb1 diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index acdbf8835e31f..c1beb102cdd65 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 7fb218266fa10..755cb735e737e 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.5.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "remotemobprogramming"; - repo = pname; + repo = "mob"; rev = "v${version}"; - sha256 = "sha256-uFtE7AprM/ye2sBQeszYy07RV7RmmqD9TGcTTuZwOfY="; + hash = "sha256-+pN+FGZCW5sPWpUNIYTFn26KBpHre+9PPBQwEcBNJWI="; }; vendorHash = null; diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 367a4d75f3b58..91c59315ba6a9 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -2,10 +2,10 @@ let pname = "mobilecoin-wallet"; - version = "1.8.0"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage"; - hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs="; + hash = "sha256-UCBQRcGFHMQlLGvChrrMmM0MYv7AZtlkngFK4ptIPU0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 492722d33f49a..9422b6452cec2 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz lilyinstarlight ]; + maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; }; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 49f6cf478fbbc..20fe2ad6d82b1 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome +, gnome-common , libnotify , libtool , libwnck @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper libtool ]; buildInputs = [ glib libwnck libnotify dbus-glib - gsettings-desktop-schemas gnome.gnome-common + gsettings-desktop-schemas gnome-common ]; configureFlags = [ "--libexecdir=$(out)/bin" ]; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 5388b7b7485eb..d21e306c8a7a6 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -11,6 +11,7 @@ , qtbase , qtpositioning , qtsvg +, qtwayland , libGLU , libGL , zlib @@ -68,6 +69,7 @@ in stdenv.mkDerivation rec { qtbase qtpositioning qtsvg + qtwayland libGLU libGL zlib diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index e6c250afc321b..436822aa2b889 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -21,8 +21,7 @@ , libjpeg8 , curl , vulkan-loader -, gnome -, zenity ? gnome.zenity +, zenity }: stdenvNoCC.mkDerivation { diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/applications/misc/pass-secret-service/default.nix index 1ce8511b27c7b..c377adc398915 100644 --- a/pkgs/applications/misc/pass-secret-service/default.nix +++ b/pkgs/applications/misc/pass-secret-service/default.nix @@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.all; mainProgram = "pass_secret_service"; - maintainers = with lib.maintainers; [ jluttine aidalgol ]; + maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 7e0dc4c2fdb2c..5dda053eb7530 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.10.1"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "pdfarranger"; repo = "pdfarranger"; rev = "refs/tags/${version}"; - hash = "sha256-l//DeaIqUl6FdGFxM8yTKcTjVNvYMllorcoXoK33Iy4="; + hash = "sha256-bHV6EluA7xp+HyejnSWJwfRBDcTuZq5Gzz0KWIs0qhA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 69be975be0ba2..cd03f1521abfa 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome +, gnome-common , gtk3 , libwnck , libX11 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome.gnome-common + gnome-common libxml2 # xmllint pkg-config vala diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 57d5ae394381f..296a81e075da3 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python310 , fetchFromGitHub , gdk-pixbuf -, gnome +, adwaita-icon-theme , gpsbabel , glib-networking , glibcLocales @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome.adwaita-icon-theme + adwaita-icon-theme gdk-pixbuf ]; diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 256ed98f9a8cd..53ad4f9aea9ed 100644 --- a/pkgs/applications/misc/rtfm/default.nix +++ b/pkgs/applications/misc/rtfm/default.nix @@ -18,14 +18,14 @@ let in crystal.buildCrystalPackage rec { pname = "rtfm"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "rtfm"; rev = "v${version}"; name = "rtfm"; - hash = "sha256-cloaGlHjtwrjuPGzAG55B58w307R+TO+MixAWTw2ags="; + hash = "sha256-+s7KXl3+j/BaneOBqVAMJJhmrG6xtcGaHhYnMvUfiVA="; }; patches = [ diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 8029eee15f896..f4df09504fc26 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper +, adwaita-icon-theme, gtk3, wrapGAppsHook3, gtksourceview3, snapper , gobject-introspection }: @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 4231adb65b410..520ea84ebd995 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ssocr"; - version = "2.23.1"; + version = "2.24.0"; src = fetchFromGitHub { owner = "auerswal"; repo = "ssocr"; rev = "v${version}"; - sha256 = "sha256-EfZsTrZI6vKM7tB6mKNGEkdfkNFbN5p4TmymOJGZRBk="; + sha256 = "sha256-79AnlO5r3IWSsV7zcI8li63bWTa+jw99cdOFFOGFZ2w="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.kroell ]; mainProgram = "ssocr"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b5bf0696f7645..b66c4f74d724e 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -31,6 +31,7 @@ during runtime. Alternatively, one can edit the desktop file themselves after it is generated See: https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ , autostartExecPath ? "syncthingtray" +, versionCheckHook }: stdenv.mkDerivation (finalAttrs: { @@ -85,9 +86,10 @@ stdenv.mkDerivation (finalAttrs: { # Make binary available in PATH like on other platforms ln -s $out/Applications/syncthingtray.app/Contents/MacOS/syncthingtray $out/bin/syncthingtray ''; - installCheckPhase = '' - $out/bin/syncthingtray --help | grep ${finalAttrs.version} - ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; cmakeFlags = [ "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}" diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index b3292b8ebb5d0..d1c4dd88583a6 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.1.3"; + version = "24.2.1"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs="; + sha256 = "sha256-AdjygNnQ3qQB03cGcQ5EB0cY3XXWLrzfCqw/U8tq1Yo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 92d93b5095d13..438277bc98cd4 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , wrapGAppsHook3 @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 9f27f8e73d7f3..2793ffcd0c639 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; - version = "0.1.47"; + version = "0.1.48"; src = fetchurl { - url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz"; - sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/verbiste-${version}.tar.gz"; + hash = "sha256-qp0OFpH4DInWjzraDI6+CeKh85JkbwVYHlJruIrGnBM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgnomeui libxml2 ]; + buildInputs = [ gtk2 libxml2 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/applications/misc/wthrr/default.nix index 5b3c6d2cd17ab..142d331be9f75 100644 --- a/pkgs/applications/misc/wthrr/default.nix +++ b/pkgs/applications/misc/wthrr/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wthrr"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "tobealive"; + owner = "ttytm"; repo = "wthrr-the-weathercrab"; rev = "v${version}"; - hash = "sha256-djrPBmXnUC8d6lWuiHyYY2so8/5RHLFYDu6xoHn6GRg="; + hash = "sha256-3bWO2Gl8/B2p4k/6QhlT46RvyMJJs7WkVcX35vWN2Fk="; }; - cargoHash = "sha256-PGbkGoWcFlTKpnrvMzrHvjFLIuohqEhVg4DYhAZOpkw="; + cargoHash = "sha256-8Uy+8UpCQyLaLsulpgC1w2XI9aqj2P5ebBlXqpuDIc4="; nativeBuildInputs = [ pkg-config @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; checkFlags = [ @@ -39,8 +40,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Weather companion for the terminal"; - homepage = "https://github.com/tobealive/wthrr-the-weathercrab"; - changelog = "https://github.com/tobealive/wthrr-the-weathercrab/releases/tag/${src.rev}"; + homepage = "https://github.com/ttytm/wthrr-the-weathercrab"; + changelog = "https://github.com/ttytm/wthrr-the-weathercrab/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "wthrr"; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 34425345f3d40..ed66ebc59313b 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "program to monitor X11/Client conversations"; homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; platforms = with platforms; unix; mainProgram = "xscope"; }; diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index da5cb37a978b0..c88a65d55d60c 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -6,7 +6,7 @@ , libnotify , libappindicator , pkg-config -, gnome +, gnome-screenshot , makeWrapper , removeReferencesTo }: @@ -67,7 +67,7 @@ flutter319.buildFlutterApplication rec { # Needed for QR scanning to work extraWrapProgramArgs = '' - --prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]} + --prefix PATH : ${lib.makeBinPath [ gnome-screenshot ]} ''; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 59b753192a2ae..13e1a71d45e02 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then { pname = "brave"; - version = "1.67.116"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.116/brave-browser_1.67.116_arm64.deb"; - hash = "sha256-YOvfXI+bSX3WZRBYXxGYhNme9NZl3ob/JYw6KshXn54="; + version = "1.67.123"; + url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_arm64.deb"; + hash = "sha256-YcTwa1sTKpLn9O4/M11nrjgItD6ktug1GFw0tNcZplg="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then { pname = "brave"; - version = "1.67.116"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.116/brave-browser_1.67.116_amd64.deb"; - hash = "sha256-J4ap0bEAg5Q40U155AdAyzereBAo8Q/YDedDVqYvaT4="; + version = "1.67.123"; + url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_amd64.deb"; + hash = "sha256-L9Jcug6HQxJ4E2C9p8BdwxkD75F2j+HaEmgjdrU9oEo="; platform = "x86_64-linux"; } else diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/applications/networking/browsers/brave/make-brave.nix index f0b9fb6cf0c6e..01458f7001828 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -12,7 +12,7 @@ , freetype , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtk4 @@ -120,7 +120,7 @@ stdenv.mkDerivation { glib gsettings-desktop-schemas gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 095fe13f9197a..1998972cc2178 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,7 +1,7 @@ { newScope, config, stdenv, makeWrapper , buildPackages , ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gtk4, adwaita-icon-theme, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , runCommand , lib, libkrb5 @@ -101,7 +101,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 gtk4 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme # Needed for kerberos at runtime libkrb5 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 15c8ffc3b22d6..79df553d3ac2b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc -, gnome/*.gnome-shell*/ +, adwaita-icon-theme , browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx-cast-bridge @@ -322,7 +322,7 @@ let --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ + --suffix XDG_DATA_DIRS : '${adwaita-icon-theme}/share' \ --set-default MOZ_ENABLE_WAYLAND 1 \ "''${oldWrapperArgs[@]}" ############################# diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 85d85ba2476b1..954bbf25e08d0 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,9 +10,11 @@ , darwin , cmake , ninja +, pkg-config , libxcrypt , python3 , qt6Packages +, woff2 , nixosTests , AppKit , Cocoa @@ -50,19 +52,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-06-08"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5"; - hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4="; + rev = "2f68e361370040d8cdc75a8ed8af4239134ae481"; + hash = "sha256-EQZTsui4lGThSi+8a6KSyL5lJnO0A8fJ8HWY4jgkpUA="; }; - patches = [ - ./nixos-font-path.patch - ]; - postPatch = '' sed -i '/iconutil/d' Ladybird/CMakeLists.txt @@ -112,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + pkg-config python3 wrapQtAppsHook ]; @@ -120,6 +119,9 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt qtbase qtmultimedia + woff2 + ] ++ lib.optional stdenv.isLinux [ + qtwayland ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa @@ -163,5 +165,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; + # use of undeclared identifier 'NSBezelStyleAccessoryBarAction' + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch b/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch deleted file mode 100644 index 468eb10b2c313..0000000000000 --- a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Userland/Libraries/LibCore/StandardPaths.cpp b/Userland/Libraries/LibCore/StandardPaths.cpp -index 77ddbeb9..76481497 100644 ---- a/Userland/Libraries/LibCore/StandardPaths.cpp -+++ b/Userland/Libraries/LibCore/StandardPaths.cpp -@@ -205,6 +205,7 @@ ErrorOr<Vector<String>> StandardPaths::font_directories() - "/Library/Fonts"_string, - TRY(String::formatted("{}/Library/Fonts"sv, home_directory())), - # else -+ "/run/current-system/sw/share/X11/fonts"_string, - "/usr/share/fonts"_string, - "/usr/local/share/fonts"_string, - TRY(String::formatted("{}/.local/share/fonts"sv, home_directory())), diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 67fed12e16538..4d679853fc5ac 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "127.0-1", + "packageVersion": "127.0.2-2", "source": { - "rev": "127.0-1", - "sha256": "0zif9b7ky423bg3cf3njyxl465hrbsha1f1hxpdgccql0id5qr7r" + "rev": "127.0.2-2", + "sha256": "1f4xz496x1nf7lmvk50hakj9p6q0kzxl5f9s2k0b6kczvyc8gw5n" }, "settings": { "rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae", "sha256": "12xgjv40mihbyfsah26vvdyb4yirydc1a884v2chnca4f5q00lc2" }, "firefox": { - "version": "127.0", - "sha512": "5a17bce357e7f445c37540115f2c131ad5a055c0cf04f20bc2eaca18f8d241a99ac76739d172b38f2ad2681633f901a0a15893801082ac5db9e20e31fc8b8291" + "version": "127.0.2", + "sha512": "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b" } } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index c52cb3f44fad7..2d7fcfecbd095 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 = "126.0.2592.53"; + version = "126.0.2592.68"; revision = "1"; - hash = "sha256-d1zqZUhk5C/jrdZngQQlGplrSssE/LUR3/AybStNavE="; + hash = "sha256-ThWtnWF7iL0OEq7+yA7vCowGZrjeiLx+d+Nff4Bwl4s="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2638.2"; + version = "127.0.2651.2"; revision = "1"; - hash = "sha256-Bv0X30ilcNBI9pblnrO1QA7ElTPMO5/JmIZIjhldO7Y="; + hash = "sha256-eYCxGMIjclqFxOy6AyLKN5DJnplq/Vf3ClYbYWV3HAw="; }; stable = import ./browser.nix { channel = "stable"; - version = "125.0.2535.92"; + version = "126.0.2592.68"; revision = "1"; - hash = "sha256-DuVz6+BzGTWZJ4smizIK2dV1OTmv0uTIQpD+yclHDN8="; + hash = "sha256-btpUMmgZ9SQL4WGKynGA/dL/8Ve9hdjoDNsBNxG531Y="; }; } diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index b9a0b49bab2ba..edb62c692abe9 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -144,6 +144,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d5bd6a3e34b98..c594fa7328adb 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "110.0.5130.49"; + version = "111.0.5168.43"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-ge2ne11BrODlvbu17G6xaLd4w2mIEsErtIaqlLY4os8="; + hash = "sha256-BKtDxKPVu0RUG+DOrfZ1TpJMK/FopfQURTfQGNWE3rc="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index f19da4505789b..12b0c63b6afe4 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -163,6 +163,14 @@ stdenv.mkDerivation rec { genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; })]; buildPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 4b97d01e9d4b2..3eccc3e016617 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.7.3329.41"; + version = "6.8.3381.46"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-jDAairYILLLiMssBvct+hZ1D2sqTsvV43IxF1UdlwpQ="; - x86_64-linux = "sha256-nipvNDc+iHIupUdl2kQIDJhUyVP/dFAUJiAN5jBY38M="; + aarch64-linux = "sha256-OR79+Y2z9b8aE5WecIlbJsJx6wdMDnlWjCE9HYmOfn0="; + x86_64-linux = "sha256-F8HibI1fWI0nPWaXDNgrSHcp2iTuC9LZhble877zrMg="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 778914763d190..dafc914c1ac27 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -4,11 +4,11 @@ # downloads at https://vivaldi.com/download/ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "114023"; + version = "115541"; src = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_37.snap"; - hash = "sha256-l1eHTAJvpkWof7Yj7M5uaa3YdLWw9F+/QvIUAfBx3ow="; + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_41.snap"; + hash = "sha256-a1peHhku+OaGvPyChvLdh6/7zT+v8OHNwt60QUq7VvU="; }; buildInputs = [ squashfsTools ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 59e0f843648ed..0d42e228b6b98 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.4.1"; + version = "2024.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-rDw25kFiD16xma/LozGjlc/Tm6hoRYzHs8spTk6HU6Y="; + hash = "sha256-hgZ9+ltS7y5nOPdGFnql4KzgBXh5zgAfXLJy8REOY8o="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix index 32207bcd05b05..3ca193f56c2d4 100644 --- a/pkgs/applications/networking/cluster/aiac/default.nix +++ b/pkgs/applications/networking/cluster/aiac/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aiac"; - version = "4.3.0"; + version = "5.0.0"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "gofireflyio"; repo = pname; rev = "v${version}"; - hash = "sha256-6u/TVCLFtcNzmchYw8dhedNRm7Lpl9oi8MpYkLYzFdg="; + hash = "sha256-4XjtzfICFCy2mA0FK0yV/hI5PPVpgXt5LlJTAxQAVq8="; }; - vendorHash = "sha256-JWQQUB4/yIDGzWeshtcWnkXQS7jYcDHwG/tef6sBizQ="; + vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE="; ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v4/libaiac.Version=v${version}" ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 6e860d2318c41..c4698ed9338bd 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-qSrMqByhOitRltYaVjIeubuoTR74x/pQ1Ad+uTPdpJU="; + hash = "sha256-G7kJrFyAsaAWXKn2Nya66unkYlU3EU1ZDbdXpC8aR+k="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-atgNLlHoX+KBtJcYZNqNsYBK0cVGI/k2mXvmcr6wWN4="; + vendorHash = "sha256-IDnOB3GxWKeA/N4Mr+qQh9sJgYsWK38F2yw6jDuHY30="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 3e9dbe040c305..cd37da1af6508 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.81.0"; + version = "1.83.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drreGXCYpjF1UD1OUzuGh2rezEhHw7Zq0Y6JujLsMMk="; + sha256 = "sha256-FIl+SWYK8+OLuynhma7IG2fozekhGZKK/t5RgD+eTtA="; }; - vendorHash = "sha256-ojl+dGrj+zmE2lqlclq3jA0K6AXdi9Ofhd4GA6nVrDo="; + vendorHash = "sha256-dklmWu+PHSEeQM2MWBkYMiyw5rX9S8SI3l86nst6v9E="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 7ea0c3c6905b7..3de93c9369eda 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.10"; + version = "0.16.11"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-SgAqq9tT4Rtg1AvoUsDvR5cCLIOuHwNUFN2NOheciYw="; + hash = "sha256-muIVjT6ssNejp5O8ju06h9e7ZVcfwXyHgQIa0IEP4Xg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 2619e8bd40788..f05b0e54bf00f 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/kUKi2BI6LMMUiy6AaYhpPIXU428Or352xYoDYdym8A="; + sha256 = "sha256-XM51pbi3BZWzdGEiQAbGlZcMJYjLEeIiexqlmSR0+AI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index 1778aa32efa90..b75eb6296138e 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.28.10+k3s1"; - k3sCommit = "a4c5612ea3dd202135e7c691c534c671a7d43690"; - k3sRepoSha256 = "00r06kc98nvbmaai8m2pbqsl0v6y3kbc3rz3l7lb9wy4qhiyxrww"; - k3sVendorHash = "sha256-8PbpjPVX+Yimhwbydu9YOTIMRTf/iLG21Ee/QMowp5Y="; + k3sVersion = "1.28.11+k3s1"; + k3sCommit = "617b0e84f419e37ba995c6dec06ccfbb24bd649c"; + k3sRepoSha256 = "04pmg0qx1sidpkv72vllmnk82v4fg490gvppp79m3jc931v059w9"; + k3sVendorHash = "sha256-6uCzObYCIETT/aswsHR9hOzUPNZe8GJbLWfNqOKWyag="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.17-k3s1.28"; + containerdSha256 = "0nhhx932j551ran3kkvyp4nmsg5c71mq0g6jrcbs2j4nn7yqdkhm"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index e06f394df94a0..6e07b2658c004 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.29.5+k3s1"; - k3sCommit = "4e53a32306759581f4ed938bcd18b6fa20b83230"; - k3sRepoSha256 = "169hzl23chs4qblicmqj3j10jg1xdq8s9717bd3pzx7wzz9s9mqw"; - k3sVendorHash = "sha256-QreiB4JMtfBjHlkAyflQAW2rnfgay62UD6emx8TgUpM="; + k3sVersion = "1.29.6+k3s1"; + k3sCommit = "83ae095ab9197f168a6bd3f6bd355f89bce39a9c"; + k3sRepoSha256 = "0gv7xh08mhgc2cyzpsvdi69xknifcpdy6znbim6r3r4lbcw2bkl9"; + k3sVendorHash = "sha256-OiZLUjQUCwso+NHg3aOrXx6/HSFOfwtzwVmLr/Fjfpw="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.17-k3s1"; + containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 739413144965c..c9bc3537ae3ee 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-5lXM7SuQvjQYWWbtRVJrdYBRbHFs1Ha9hQLDweaTKQ4="; + hash = "sha256-cMaOqybXzbAelhSfUal4kgQKwz/dEp/fVQ8SyjaaAZU="; }; - vendorHash = "sha256-Fc3WLeEqH2CK6b4jWqcxCBYl2ST6scjjNA1/Rl3Go1o="; + vendorHash = "sha256-M2nco2qxutpxKv//o+h2LY0x5Tk6DWxFL383cpGVnkI="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index b710fe68b3ec4..6584230191567 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "roxctl"; - version = "4.4.3"; + version = "4.4.4"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-sQUX2Ou+fL4G2u/Mdnl9SwdwRkogiyq3tkauUeW//dU="; + sha256 = "sha256-1eu7khgs6nzp+d1Gtz2DggD2Gie08auw1XxSZsnRdaM="; }; vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA="; diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 482aa416f2d8a..58fac193dd2d6 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGo122Module rec { pname = "timoni"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-LN2VxXKjEaUgLSVc0G+OlhmaZ4anBmyXbOBOrGIeYG0="; + hash = "sha256-g0B5UbveQ6KYqfXGF5bsGJfUuZ3q1TNEaC1GwtNAig8="; }; - vendorHash = "sha256-Vj7P0o0UM35WTv9s1BAcW6MuzjIinADOFsuCK1bpKP0="; + vendorHash = "sha256-XeqHETKWw74edsWCOKC+bhIt0NZz5mgrTShoQk1hb5Y="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 832133082f778..8a0f00e73953d 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.12.0"; + version = "4.12.2"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-W1X/d2Xf31xQWZH7ShH8Y6axhhyTOqxE/EjxNvR6pBU="; + hash = "sha256-t9cjF5gCRIv5WvGvYTGOFYGRKTJGOvJ3xfhXk+lmAF8="; }; - vendorHash = "sha256-Dz45h33Rv4Pf5Lo0aok37MNrcbT8f/xrPPkGJMNBo8Y="; + vendorHash = "sha256-KqsMD0WbFDZwVqsIvg0LfOhcEO7oZw7v5XJwyDj9wxw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index a922d70cd68fd..f66f0262242b6 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -6,7 +6,7 @@ , python3 , dropbox , gtk4 -, gnome +, nautilus , gdk-pixbuf , gobject-introspection }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { buildInputs = [ python3 gtk4 - gnome.nautilus + nautilus ]; configureFlags = [ diff --git a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock index c7e42c551fe72..208d5e34198bf 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock +++ b/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -57,15 +57,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -103,7 +103,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -158,6 +158,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] name = "bytes" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -180,6 +186,7 @@ dependencies = [ "clap", "clap-verbosity-flag", "cloudflare", + "local-ip-address", "log", "pretty_env_logger", "public-ip", @@ -209,9 +216,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", @@ -229,9 +236,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.5" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -249,7 +256,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -260,21 +267,18 @@ checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "cloudflare" -version = "0.10.1" -source = "git+https://github.com/jcgruenhage/cloudflare-rs.git?branch=make-owner-fields-optional#02397fc4211886548a31a0731b240f2e17309de4" +version = "0.12.0" +source = "git+https://github.com/Wyn-Price/cloudflare-rs.git?branch=wyn/zone-details#a6179f8b3b520b17788f39fcd5f103e81a87a890" dependencies = [ - "anyhow", - "async-trait", - "base64 0.13.1", - "cfg-if", "chrono", "http", "percent-encoding", "reqwest", "serde", "serde_json", - "serde_qs", + "serde_urlencoded", "serde_with", + "thiserror", "url", "uuid", ] @@ -346,7 +350,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -368,7 +372,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -424,6 +428,12 @@ dependencies = [ ] [[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] name = "encoding_rs" version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -465,26 +475,15 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -576,7 +575,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -879,9 +878,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "linked-hash-map" @@ -900,9 +899,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "local-ip-address" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66357e687a569abca487dc399a9c9ac19beb3f13991ed49f00c144e02cbd42ab" +dependencies = [ + "libc", + "neli", + "thiserror", + "windows-sys", +] [[package]] name = "lock_api" @@ -928,9 +939,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "mime" @@ -977,6 +988,31 @@ dependencies = [ ] [[package]] +name = "neli" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1100229e06604150b3becd61a4965d5c70f3be1759544ea7274166f4be41ef43" +dependencies = [ + "byteorder", + "libc", + "log", + "neli-proc-macros", +] + +[[package]] +name = "neli-proc-macros" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4" +dependencies = [ + "either", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", +] + +[[package]] name = "nibble_vec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -987,9 +1023,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1042,7 +1078,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1109,7 +1145,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1148,9 +1184,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1238,9 +1274,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", @@ -1250,9 +1286,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", @@ -1261,15 +1297,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -1292,6 +1328,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -1310,9 +1347,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", @@ -1382,7 +1419,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1397,17 +1434,6 @@ dependencies = [ ] [[package]] -name = "serde_qs" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - -[[package]] name = "serde_urlencoded" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1444,7 +1470,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1507,9 +1533,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1517,6 +1543,27 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tempfile" version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1565,7 +1612,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1613,9 +1660,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -1636,7 +1683,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1707,7 +1754,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1826,7 +1873,6 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom", "serde", ] @@ -1872,7 +1918,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -1906,7 +1952,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index aba0262e32588..9659e9777a2e9 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cfdyndns"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "nrdxp"; repo = "cfdyndns"; rev = "v${version}"; - hash = "sha256-iwKMTWLK7pgz8AEmPVBO1bTWrXTokQJ+Z1U4CiiRdho="; + hash = "sha256-OV1YRcZDzYy1FP1Bqp9m+Jxgu6Vc0aWpbAffNcdIW/4="; }; cargoLock.lockFile = ./Cargo.lock; - cargoLock.outputHashes."cloudflare-0.10.1" = "sha256-AJW4AQ34EDhxf7zMhFY2rqq5n4IaSVWJAYi+7jXEUVo="; + cargoLock.outputHashes."cloudflare-0.12.0" = "sha256-8/C5mHN7g/k3q9BzFC9TIKMlgmBsmvC4xWVEoz1Sz9c="; cargoLock.outputHashes."public-ip-0.2.2" = "sha256-DDdh90EAo3Ppsym4AntczFuiAQo4/QQ9TEPJjMB1XzY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index c9c54cfe08cda..ce49d6b150161 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.27"; + version = "0.2.29"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-APRa+wZhls7O2q3zVPEB9Kegd1YspcfC8PSJy6KFlR8="; + sha256 = "sha256-VAbMcON75dTS+1lUqmveN2WruQCCmK3kB86e+vKM64U="; }; - vendorHash = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU="; + vendorHash = "sha256-JaYJq8lnZHK75Rwif77A9y9jTUoJFyoSZQgaExnY+rM="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index d8c4089eee728..5e1ad5cddbd05 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://alfaview.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index f3ae1665fe3d9..6b3f5904e9757 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -60,7 +60,7 @@ buildNpmPackage rec { meta = with lib; { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ashkitten ]; + maintainers = with maintainers; [ abbe ]; license = licenses.agpl3Only; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 428715b6f1b7a..b818baa899300 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -23,23 +23,17 @@ , webrtc-audio-processing }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dino"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "v${version}"; - sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-I0ASeEjdXyxhz52QisU0q8mIBTKMfjaspJbxRIyOhD4="; }; - patches = [ - # fixes build failure https://github.com/dino/dino/issues/1576 - # backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74 - ./fix-compile-new-vala-c.diff - ]; - postPatch = '' # don't overwrite manually set version information substituteInPlace CMakeLists.txt \ @@ -92,7 +86,7 @@ stdenv.mkDerivation rec { "-DRTP_ENABLE_VP9=true" "-DVERSION_FOUND=true" "-DVERSION_IS_RELEASE=true" - "-DVERSION_FULL=${version}" + "-DVERSION_FULL=${finalAttrs.version}" "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" @@ -133,4 +127,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ qyliss tomfitzhenry ]; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff b/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff deleted file mode 100644 index b8277f32afc9c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi -index bcf12569..b32efd03 100644 ---- a/plugins/gpgme-vala/vapi/gpgme_public.vapi -+++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi -@@ -22,9 +22,9 @@ public class Key { - public string issuer_name; - public string chain_id; - public Validity owner_trust; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public SubKey[] subkeys; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public UserID[] uids; - public KeylistMode keylist_mode; - // public string fpr; // requires gpgme >= 1.7.0 diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 66d7abc0822d0..5d49787837855 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -7,7 +7,7 @@ , flutter319 , pulseaudio , makeDesktopItem -, gnome +, zenity , targetFlutterPlatform ? "linux" }: @@ -50,7 +50,7 @@ flutter319.buildFlutterApplication (rec { runtimeDependencies = [ pulseaudio ]; - extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin"; + extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin"; env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7f273359de4e7..ef57fe10ac815 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook3 # Native dependencies -, python3, gtk3, gobject-introspection, gnome +, python3, gtk3, gobject-introspection, adwaita-icon-theme , gtksourceview4 , glib-networking @@ -31,7 +31,8 @@ python3.pkgs.buildPythonApplication rec { format = "pyproject"; buildInputs = [ - gtk3 gnome.adwaita-icon-theme + gtk3 + adwaita-icon-theme gtksourceview4 glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 8a1052d04df4f..8390d77934585 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -8,17 +8,17 @@ let pname = "mattermost-desktop"; - version = "5.7.0"; + version = "5.8.1"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU="; + hash = "sha256-VuYHF5ALdbsKxBI7w5UhcqKYLV8BHZncWSDeuCy/SW0="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ="; + hash = "sha256-b+sVzMX/NDavshR+WsQyVgYyLkIPSuUlZGqK6/ZjLFs="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix index 46ea22da5db81..b6fbbd68401f1 100644 --- a/pkgs/applications/networking/instant-messengers/neosay/default.nix +++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { mainProgram = "neosay"; homepage = "https://github.com/donuts-are-good/neosay"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index cbb23559ae61f..0167146e57853 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -1,4 +1,5 @@ { alsa-lib +, libuuid , cups , dpkg , fetchurl @@ -86,7 +87,7 @@ stdenv.mkDerivation { makeShellWrapper $out/opt/QQ/qq $out/bin/qq \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" @@ -115,6 +116,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ fee1-dead ]; + maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index 4fa23026a9571..4c5fadb9ef193 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-06-07 +# Last updated: 2024-06-17 { version = "3.2.9"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_arm64_01.deb"; - arm64_hash = "sha256-wZyaIkJdGDvIw8PrRlOiKpo3rdeELlxYBPyS6llbL4w="; - amd64_hash = "sha256-DcQWwep4p4aWUAoBNQ9Ge1QBiCxk6BhcziTDSHmRpgY="; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240617_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240617_arm64_01.deb"; + arm64_hash = "sha256-qC3eUc3Hs1nolZJhAds0Qx+tAlD/AR3scGxmcA8dtEw="; + amd64_hash = "sha256-ofoelAzbuCgxSHsZciWSVkDFDv+zsW+AzZqjeNlaja0="; } diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 93fb435f3909a..6db3418789b2c 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.15"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-fMnr7RCNoYVyV+CzKOIqaGd6T6+3fJxMuPjNdFAZdX0="; + hash = "sha256-ryfYaePwL4W6x8sKlxACadLUvXEqyqJ0enlSnmVmpUo="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { atk pango freetype - libgnome-keyring3 + libgnome-keyring fontconfig gdk-pixbuf cairo diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index c4f59cd3dd557..fcd1e22cf40c1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.13.0"; + version = "7.14.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-lwo5O8UAjjMuaeM8J804oN+y72uYZBL+eP/NwpnD4H0="; + hash = "sha256-nRvGpAKRIPgXStrVu4qSMoW01SACV/wW/c05lLncCW8="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 05803ede09534..39f05b615e36e 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 = "20240627"; + version = "20240702-2"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-Kvz2Ft7gcvyQr8CxTZ7bHVn7q0yItGsK6/rChz0eras="; + hash = "sha256-nPNhN4ODCZMii5VATcvh8qvdrQQ0r94X6vlaYgtQFac="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 99ff0b412e2cd..ea3f0b672939d 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome-keyring , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: @@ -30,7 +30,7 @@ let gtk3 libappindicator-gtk3 - gnome.gnome-keyring + gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index f59b9c3774bc6..b5ac402921d2a 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "teams-for-linux"; homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly chvp ]; + maintainers = with lib.maintainers; [ muscaln qjoly chvp ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; 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 f0732ec039208..aaabf518b959d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -6,17 +6,18 @@ , cmake , ninja , clang +, lld , python3 , wrapQtAppsHook , removeReferencesTo -, extra-cmake-modules , qtbase , qtimageformats , qtsvg -, kwayland +, qtwayland +, kcoreaddons , lz4 , xxHash -, ffmpeg_4 +, ffmpeg , openalSoft , minizip , libopus @@ -25,94 +26,59 @@ , range-v3 , tl-expected , hunspell -, glibmm +, gobject-introspection +, glibmm_2_68 , jemalloc , rnnoise , abseil-cpp , microsoft-gsl +, boost +, fmt , wayland , libicns -, Cocoa -, CoreFoundation -, CoreServices -, CoreText -, CoreGraphics -, CoreMedia -, OpenGL -, AudioUnit -, ApplicationServices -, Foundation -, AGL -, Security -, SystemConfiguration -, Carbon -, AudioToolbox -, VideoToolbox -, VideoDecodeAcceleration -, AVFoundation -, CoreAudio -, CoreVideo -, CoreMediaIO -, QuartzCore -, AppKit -, CoreWLAN -, WebKit -, IOKit -, GSS -, MediaPlayer -, IOSurface -, Metal -, MetalKit +, darwin }: let tg_owt = callPackage ./tg_owt.nix { - abseil-cpp = abseil-cpp.override { - # abseil-cpp should use the same compiler - inherit stdenv; - cxxStandard = "20"; - }; - # tg_owt should use the same compiler inherit stdenv; - - inherit Cocoa AppKit IOKit IOSurface Foundation AVFoundation CoreMedia VideoToolbox - CoreGraphics CoreVideo OpenGL Metal MetalKit CoreFoundation ApplicationServices; }; + + mainProgram = if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"; in stdenv.mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.4.9"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; - rev = "k${version}"; - sha256 = "sha256-6bF/6fr8mJyyVg53qUykysL7chuewtJB8E22kVyxjHw="; + rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2"; + sha256 = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; fetchSubmodules = true; }; patches = [ - ./kf594.patch - ./shortcuts-binary-path.patch + ./macos.patch + ./macos-opengl.patch ]; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' '' + lib.optionalString stdenv.isDarwin '' - sed -i "13i#import <CoreAudio/CoreAudio.h>" Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm - substituteInPlace Telegram/CMakeLists.txt \ - --replace 'COMMAND iconutil' 'COMMAND png2icns' \ - --replace '--convert icns' "" \ - --replace '--output AppIcon.icns' 'AppIcon.icns' \ - --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png" + substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ + --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.isDarwin; + nativeBuildInputs = [ pkg-config cmake @@ -123,7 +89,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ # to build bundled libdispatch clang - extra-cmake-modules + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + lld ]; buildInputs = [ @@ -132,7 +100,7 @@ stdenv.mkDerivation rec { qtsvg lz4 xxHash - ffmpeg_4 + ffmpeg openalSoft minizip libopus @@ -141,15 +109,18 @@ stdenv.mkDerivation rec { rnnoise tg_owt microsoft-gsl + boost ] ++ lib.optionals stdenv.isLinux [ - kwayland + qtwayland + kcoreaddons alsa-lib libpulseaudio hunspell - glibmm + glibmm_2_68 jemalloc + fmt wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -180,27 +151,34 @@ stdenv.mkDerivation rec { MediaPlayer IOSurface Metal + NaturalLanguage libicns - ]; + ]); enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" - "-DDESKTOP_APP_QT6=OFF" ]; installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r Kotatogram.app $out/Applications - ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin + cp -r ${mainProgram}.app $out/Applications + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} ''; preFixup = '' - binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"} - remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName - remove-references-to -t ${microsoft-gsl} $out/bin/$binName - remove-references-to -t ${tg_owt.dev} $out/bin/$binName + remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram} + remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram} + remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; passthru = { @@ -208,8 +186,8 @@ stdenv.mkDerivation rec { }; meta = with lib; { + inherit mainProgram; description = "Kotatogram – experimental Telegram Desktop fork"; - mainProgram = "kotatogram-desktop"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. @@ -220,7 +198,5 @@ stdenv.mkDerivation rec { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch deleted file mode 100644 index 0fa2d8bc8f6ee..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -index 7641579aa..3c195e397 100644 ---- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include "base/platform/base_platform_info.h" - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <plasmashell.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/plasmashell.h> - - using namespace KWayland::Client; - -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -index 32f0de6..30a087f 100644 ---- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <QtCore/QPointer> - #include <QtGui/QWindow> - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <xdgforeign.h> --#include <idleinhibit.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/xdgforeign.h> -+#include <KWayland/Client/idleinhibit.h> - - using namespace KWayland::Client; - -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -index 01f1e80..163cb6a 100644 ---- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <private/qwaylandwindow_p.h> - #include <private/qwaylandshellsurface_p.h> - --#include <connection_thread.h> --#include <registry.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> - - Q_DECLARE_METATYPE(QMargins); - diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch new file mode 100644 index 0000000000000..e81bd53b440ce --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch @@ -0,0 +1,66 @@ +diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp +index 655e7cf410..c356acbffe 100644 +--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp ++++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp +@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() { + Ui::GL::ChosenRenderer Pip::chooseRenderer( + Ui::GL::Capabilities capabilities) { + const auto use = Platform::IsMac() +- ? true ++ ? false + : capabilities.transparency; + LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use))); + if (use) { +Submodule Telegram/lib_ui contains modified content +diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp +index 150eb8b..c7ce9f9 100644 +--- a/Telegram/lib_ui/ui/gl/gl_detection.cpp ++++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp +@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) { + + Backend ChooseBackendDefault(Capabilities capabilities) { + const auto use = ::Platform::IsMac() +- ? true ++ ? false + : ::Platform::IsWindows() + ? capabilities.supported + : capabilities.transparency; +diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm +index 7b29363..22c4fb3 100644 +--- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm ++++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm +@@ -16,7 +16,6 @@ + #include <QtCore/QAbstractNativeEventFilter> + #include <QtGui/QWindow> + #include <QtGui/QtEvents> +-#include <QOpenGLWidget> + #include <Cocoa/Cocoa.h> + + @interface WindowObserver : NSObject { +@@ -138,7 +137,6 @@ public: + + private: + void init(); +- void initOpenGL(); + void resolveWeakPointers(); + void revalidateWeakPointers() const; + void initCustomTitle(); +@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() { + } + } + +-void WindowHelper::Private::initOpenGL() { +- auto forceOpenGL = std::make_unique<QOpenGLWidget>(_owner->window()); +-} +- + void WindowHelper::Private::resolveWeakPointers() { + if (!_owner->window()->winId()) { + _owner->window()->createWinId(); +@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() { + } + + void WindowHelper::Private::init() { +- initOpenGL(); + resolveWeakPointers(); + initCustomTitle(); + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch new file mode 100644 index 0000000000000..8082f09646052 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch @@ -0,0 +1,52 @@ +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +index 7ce90d3..dac3c2c 100644 +--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; + + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; ++#if 0 + if (@available(macOS 12.0, *)) { + [center + addObserver: _observer +@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + name: NSProcessInfoPowerStateDidChangeNotification + object: nil]; + } ++#endif + [center + addObserver: _observer + selector: @selector(powerStateChanged:) +@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const { + return std::nullopt; + } + NSProcessInfo *info = [NSProcessInfo processInfo]; ++#if 0 + if (@available(macOS 12.0, *)) { + if ([info isLowPowerModeEnabled]) { + return true; + } + } ++#endif + const auto state = DetectBatteryState(); + if (!state.has || !state.draining) { + return false; +Submodule Telegram/lib_webview contains modified content +diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +index 657c5a4..4bfc097 100644 +--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm ++++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +@@ -317,9 +317,11 @@ Instance::Instance(Config config) { + _dataRequestHandler = std::move(config.dataRequestHandler); + [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; + _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; ++#if 0 + if (@available(macOS 13.3, *)) { + _webview.inspectable = config.debug ? YES : NO; + } ++#endif + [_manager addScriptMessageHandler:_handler name:@"external"]; + [_webview setNavigationDelegate:_handler]; + [_webview setUIDelegate:_handler]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch deleted file mode 100644 index f173a64f141a0..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp -index 2a092c6ea..de46dd269 100644 ---- a/Telegram/SourceFiles/core/application.cpp -+++ b/Telegram/SourceFiles/core/application.cpp -@@ -1173,7 +1173,7 @@ void Application::startShortcuts() { - - void Application::RegisterUrlScheme() { - base::Platform::RegisterUrlScheme(base::Platform::UrlSchemeDescriptor{ -- .executable = cExeDir() + cExeName(), -+ .executable = qsl("kotatogram-desktop"), - .arguments = qsl("-workdir \"%1\"").arg(cWorkingDir()), - .protocol = qsl("tg"), - .protocolName = qsl("Telegram Link"), -diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index 26168baa7..00d2525a0 100644 ---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -303,19 +303,11 @@ bool GenerateDesktopFile( - - QFile target(targetFile); - if (target.open(QIODevice::WriteOnly)) { -- fileText = fileText.replace( -- QRegularExpression( -- qsl("^TryExec=.*$"), -- QRegularExpression::MultilineOption), -- qsl("TryExec=%1").arg( -- QString(cExeDir() + cExeName()).replace('\\', "\\\\"))); -- - fileText = fileText.replace( - QRegularExpression( - qsl("^Exec=kotatogram-desktop(.*)$"), - QRegularExpression::MultilineOption), -- qsl("Exec=%1 -workdir %2\\1").arg( -- EscapeShellInLauncher(cExeDir() + cExeName()), -+ qsl("Exec=kotatogram-desktop -workdir %1\\1").arg( - EscapeShellInLauncher(cWorkingDir()))); - - fileText = fileText.replace( diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 694021d0f7fe2..e2f3c4ba884ed 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , cmake , ninja @@ -9,10 +8,10 @@ , libjpeg , openssl , libopus -, ffmpeg_4 +, ffmpeg , protobuf , openh264 -, usrsctp +, crc32c , libvpx , libX11 , libXtst @@ -28,65 +27,23 @@ , mesa , libdrm , libGL -, Cocoa -, AppKit -, IOKit -, IOSurface -, Foundation -, AVFoundation -, CoreMedia -, VideoToolbox -, CoreGraphics -, CoreVideo -, OpenGL -, Metal -, MetalKit -, CoreFoundation -, ApplicationServices +, darwin }: -let - libsrtp = fetchFromGitHub { - owner = "cisco"; - repo = "libsrtp"; - - # https://github.com/desktop-app/tg_owt/commit/6894e86eef8809d42b66eb85e376006f2a816a56 - rev = "a566a9cfcd619e8327784aa7cff4a1276dc1e895"; - sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU="; - }; -in - stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-04-13"; + version = "0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396"; - sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM="; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; - patches = [ - ./tg_owt.patch - - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/commit/0614aac699b1a53242ffe2664e3724533bf64f97.patch"; - hash = "sha256-iCdX518CB/RboDFhl3opnwcAgtqpNWZzYtV75Q+WB6Y="; - }) - - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/commit/9d120195334db4f232c925529aa7601656dc59d7.patch"; - hash = "sha256-k99OBCdE2eQVyXEyvreEqVtzC8Xfdolbgd1Z7lV2ceE="; - }) - ]; - - postPatch = '' - rm -r src/third_party/libsrtp - cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ @@ -101,10 +58,10 @@ stdenv.mkDerivation { libjpeg openssl libopus - ffmpeg_4 + ffmpeg protobuf openh264 - usrsctp + crc32c libvpx abseil-cpp ] ++ lib.optionals stdenv.isLinux [ @@ -121,7 +78,7 @@ stdenv.mkDerivation { mesa libdrm libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa AppKit IOKit @@ -137,7 +94,7 @@ stdenv.mkDerivation { MetalKit CoreFoundation ApplicationServices - ]; + ]); enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch deleted file mode 100644 index be7d696fc84d3..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/src/modules/include/module_common_types_public.h -+++ b/src/modules/include/module_common_types_public.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - -+#include <cstdint> - #include <limits> - - #include "absl/types/optional.h" -diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h -index 28c95ea9..790b0b73 100644 ---- a/src/common_video/h265/h265_pps_parser.h -+++ b/src/common_video/h265/h265_pps_parser.h -@@ -13,6 +13,8 @@ - - #include "absl/types/optional.h" - -+#include <stdint.h> -+ - namespace rtc { - class BitBuffer; - } ---- a/src/rtc_base/third_party/base64/base64.h -+++ b/src/rtc_base/third_party/base64/base64.h -@@ -11,6 +11,7 @@ - #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/modules/audio_processing/transient/file_utils.h -+++ b/src/modules/audio_processing/transient/file_utils.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ - #define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ - -+#include <stdint.h> - #include <string.h> - - #include "rtc_base/system/file_wrapper.h" diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 73c71d294c848..f41713389679b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }: stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]} ''; meta = kotatogram-desktop.meta // { platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 263d5e3342e83..9187e935ad7c1 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-CemVlw0S4UmKFopWSh1Hv2znMRN3guIBx303esK/gLw="; + hash = "sha256-mTa+vdYSBcXTYlcDGJWktGVRC6NPBGcjb+syr/A1QIQ="; }; - cargoHash = "sha256-LgA6gdBRLsow98nv9A5rYb/v/FGzu/LPQwftyeuKHk4="; + cargoHash = "sha256-xTPx4P9SbOyC3YjZNxNFh65pSfiPjMKV+wgZtT00Me0="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index e56697be4f995..a1e6177f72783 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas python3 - notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme + notmuch boost gsettings-desktop-schemas adwaita-icon-theme glib-networking protobuf vim ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 0fe2e4796efc4..f605aa3617b2c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -23,6 +23,7 @@ , libical , db , sqlite +, adwaita-icon-theme , gnome , gnome-desktop , librsvg @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme bogofilter db evolution-data-server diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index 6b65211d0b4b3..bae0bdb2fd454 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -1,8 +1,8 @@ -{ lib, makeWrapper, symlinkJoin, gnome, plugins }: +{ lib, makeWrapper, symlinkJoin, evolution-data-server, plugins }: symlinkJoin { name = "evolution-with-plugins"; - paths = [ gnome.evolution-data-server ] ++ plugins; + paths = [ evolution-data-server ] ++ plugins; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 3e09dbc9b8786..bf0b709abdcf1 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "230.240603.0"; + version = "232.240626.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-pgRqlaUbEDEAd4frooSloeiNEX02VESPhqIzRIuQshI="; + hash = "sha256-LsLhsWrH+hRcx7hjx2GbtDMEf1oAygSwtsCxpmnZOfE="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b72e218ddcfb7..91ec4ee9c26ef 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -27,6 +27,7 @@ let cmakeFlags = [ "-D g15=OFF" + "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17 ] ++ (overrides.configureFlags or [ ]); preConfigure = '' diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 58e48e69fc4f6..e1392d00f4ad5 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-Me1hux+Y3EiT9vlP4+4019JPcDEW0d5byFO6YIfKbbw="; + hash = "sha256-UR5hUV7HTDaEbltQikgKfQypPXVee46PLP5bBEDFSsg="; }; - vendorHash = "sha256-BlZYXLvB05BTI2gMke8I2ob4jYSrixfpBUqKzNcHisI="; + vendorHash = "sha256-roEw8A7TFLoUR7BY4r53HNB1b7IbKwgg7x0e63UGpu8="; inherit subPackages; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7e78fb5e65878..59334f61dad24 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.13.0"; + version = "3.13.1"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-i4vQGH9NSxIrLaPdCEh+WN6i6NQilH6uO4dSk/mhLi8="; + hash = "sha256-Ux0zbOribIbrABQQtUbp6NK96YYaHgREQUmgm9/MQaI="; }; patches = [ diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix index c0fa9afdb2430..5a8866e26be4e 100644 --- a/pkgs/applications/networking/novnc/default.nix +++ b/pkgs/applications/networking/novnc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "novnc"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; rev = "v${version}"; - sha256 = "sha256-G7Rtv7pQFR9UrzhYXDyBf+FRqtjo5NAXU7m/HeXhI1k="; + sha256 = "sha256-3Q87bYsC824/8A85Kxdqlm+InuuR/D/HjVrYTJZfE9Y="; }; patches = with python3.pkgs; [ diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 741cca91543ac..e4e44f79aea5f 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -2,7 +2,7 @@ , fetchpatch , qmake, cmake, pkg-config, miniupnpc, bzip2 , speex, libmicrohttpd, libxml2, libxslt, sqlcipher, rapidjson, libXScrnSaver -, qtbase, qtx11extras, qtmultimedia, libgnome-keyring3 +, qtbase, qtx11extras, qtmultimedia, libgnome-keyring }: mkDerivation rec { @@ -33,7 +33,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config qmake cmake ]; buildInputs = [ - speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring3 + speex miniupnpc qtmultimedia qtx11extras qtbase libgnome-keyring bzip2 libXScrnSaver libxml2 libxslt sqlcipher libmicrohttpd rapidjson ]; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 2b27eef11c32f..edb42aa79e9ba 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-PM162vj1Q336fM5z6KoBgtujz9UgESIxUW3Lw8AEYTw="; + hash = "sha256-3nEf9maHDd2LmRpgRqvFOub2DQNvjP3iEBRUlpvo8yg="; }; - vendorHash = "sha256-qi6ME74pJH/wgDh0xp/Rsc9hPd3v3L/M8pBQJzNieK8="; + vendorHash = "sha256-c8KNdENF0wRQ0Ssv6mgnZkY4BOcEoY7r80/hd7XJ5yo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index d80850edd4466..7096c6265b654 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -9,7 +9,7 @@ , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz , wayland # The themes here are soft dependencies; only icons are missing without them. -, gnome +, adwaita-icon-theme , withKf5Wallet ? stdenv.isLinux, libsForQt5 , withLibsecret ? stdenv.isLinux , withVte ? true @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 spice-protocol spice-gtk libepoxy at-spi2-core - openssl gnome.adwaita-icon-theme json-glib libsodium + openssl adwaita-icon-theme json-glib libsodium harfbuzz python3 wayland ] ++ lib.optionals stdenv.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 webkitgtk_4_1 ] diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 5bf146995f128..796959139d480 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar thoughtpolice cwoac jwoudenberg ]; + maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; mainProgram = "rslsync"; }; } diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3913c98fea88f..4110db3022eb1 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.68"; + version = "3.69"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-ncA6YXa/focfmPMdEQWbeUxrLhwCqQiPqjP0SovLB2c="; + hash = "sha256-stbp4SqBXTZv5QXDwslsg/Y4lhkPGbwcslWZTR3c2v0="; }; - vendorHash = "sha256-YgrDzfcp1Lh8bOI1FF7bTBquaShhgE9nZ/+7mvFiQCc="; + vendorHash = "sha256-OfLC7a2+YM95F/anrwvhTw4mc72ogBZfLEPDUKMn9IE="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix index 8ed53ec0771f9..655626d07e262 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation { mainProgram = "qtwirediff"; homepage = "https://github.com/aaptel/qtwirediff"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 7eef4f4510051..fe2d7b07acc82 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, substituteAll +, darwin , just , pkg-config , wrapGAppsHook4 @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-fJK3UTa5NS+dSsjnqZtRN3HmHQ1bYU2jepkJ5tchYD4="; + hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8="; }; - cargoHash = "sha256-/0w52bh9CsBoMTJsnWuEAQNgQzf92mbzh53H4iQYswc="; + cargoHash = "sha256-nlYkFgm5r6nAbJvtrXW2VxzVYq1GrSs8bzHYWOglL1c="; postPatch = '' pushd $cargoDepsCopy/librclone-sys @@ -66,8 +66,15 @@ rustPlatform.buildRustPackage rec { libadwaita librclone pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Security ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=incompatible-function-pointer-types" + ]); + preFixup = '' gappsWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ rclone ]}" diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index d6f2f2ef04476..7df9b7224408e 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-quy1maeC1ebVzMvN+JzKf8AmMbipju9vvdTU03SyNnc="; + hash = "sha256-EwfICUKlDnlkD1vxR1jpNybvUG4mOHfRRgk8VB9T+hs="; }; - vendorHash = "sha256-lGjJLqEGBFd2aYm82xrDfLK90Mcrhb7bMtXSNZpp/bM="; + vendorHash = "sha256-lEGFOBR0d8IfqBYdrC8awRhGcPqt0y4oOWU+xu4ClfE="; subPackages = [ "cmd/trayscale" ]; @@ -46,11 +46,11 @@ buildGoModule rec { ''; meta = with lib; { - changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${version}"; + changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${src.rev}"; description = "Unofficial GUI wrapper around the Tailscale CLI client"; homepage = "https://github.com/DeedleFake/trayscale"; license = licenses.mit; - maintainers = with maintainers; [ patka ]; + maintainers = with maintainers; [ ]; mainProgram = "trayscale"; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index b5d181dc73a47..691328e3e6607 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-nZg0Ha457zrBgYpKIHgGkDxTVQSRthQCCxtT2xWtAlQ="; + x86_64-linux = "sha256-yShTvGcmWwa5bhZP0QYgDtOvTAdnWsFTBnHB309ya/s="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "9.4.1"; + version = "10.0"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/applications/networking/zerobin/default.nix index e75f121d5fee0..62201ba6ca089 100644 --- a/pkgs/applications/networking/zerobin/default.nix +++ b/pkgs/applications/networking/zerobin/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, nodePackages +, uglify-js }: python3Packages.buildPythonApplication rec { @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.doit python3Packages.pyscss - nodePackages.uglify-js + uglify-js ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 6675338719937..60fdf00a2b3e7 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkg-config +{ lib, stdenv, fetchurl, fetchpatch2, openssl, pkg-config , withPerl ? false, perl , withPython ? false, python3 , withTcl ? false, tcl @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz"; }; + patches = [ + (fetchpatch2 { + name = "CVE-2024-39844.patch"; + url = "https://github.com/znc/znc/commit/8cbf8d628174ddf23da680f3f117dc54da0eb06e.patch"; + hash = "sha256-JeKirXReiCiNDUS9XodI0oHASg2mPDvQYtV6P4L0mHM="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index d05c83cb19992..91700299400a2 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -6,7 +6,7 @@ , gtksourceview3 , libappindicator-gtk3 , libnotify -, gnome +, zenity , wmctrl }: @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { ]; runtimeDeps = [ - gnome.zenity + zenity wmctrl ]; diff --git a/pkgs/applications/office/beancount/beancount_share.nix b/pkgs/applications/office/beancount/beancount_share.nix index 19b49a2697ccf..2d702ad8d7ce7 100644 --- a/pkgs/applications/office/beancount/beancount_share.nix +++ b/pkgs/applications/office/beancount/beancount_share.nix @@ -25,5 +25,7 @@ python3.pkgs.buildPythonApplication rec { description = "Beancount plugin to share expenses with external partners within one ledger"; license = licenses.agpl3Plus; maintainers = with maintainers; [ matthiasbeyer ]; + broken = true; # At 2024-06-29, missing unpacked dependency + # https://hydra.nixos.org/build/262800507/nixlog/1 }; } diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/applications/office/endeavour/default.nix index 851eab538818d..806e024985772 100644 --- a/pkgs/applications/office/endeavour/default.nix +++ b/pkgs/applications/office/endeavour/default.nix @@ -6,7 +6,7 @@ , pkg-config , wrapGAppsHook4 , gettext -, gnome +, adwaita-icon-theme , glib , gtk4 , wayland @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpeas gnome-online-accounts gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme # Plug-ins evolution-data-server-gtk4 # eds diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index d9b376a1962e7..74c9e571375fc 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome, wrapGAppsHook3, gtk3, bison, python3Packages +, goffice, gnome, adwaita-icon-theme, wrapGAppsHook3, gtk3, bison, python3Packages , itstool }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome.adwaita-icon-theme + goffice gtk3 adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 846b4180625ab..911ed9715320d 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook3 , libsoup -, gnome +, adwaita-icon-theme }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libgsf libofx libsoup - gnome.adwaita-icon-theme + adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 000942ff68bdd..5c21eeb721408 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 -, libsoup_3, gnome }: +, libsoup_3, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "homebank"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; + buildInputs = [ gtk libofx libsoup_3 adwaita-icon-theme]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index c81d08d31d98f..9043d575fa060 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation { cp -R . $out/Applications/${appName} cat > $out/bin/${scriptName} << EOF #!${stdenvNoCC.shell} - open -na $out/Applications/${appName} --args "$@" + open -na $out/Applications/${appName} --args "\$@" EOF chmod +x $out/bin/${scriptName} runHook postInstall diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d679b168e24ff..30e5f7864cd03 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -86,7 +86,7 @@ , glm , gst_all_1 , gdb -, gnome +, adwaita-icon-theme , glib , ncurses , libepoxy @@ -311,7 +311,7 @@ in stdenv.mkDerivation (finalAttrs: { gettext glib glm - gnome.adwaita-icon-theme + adwaita-icon-theme gperf gpgme graphite2 diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 433b8855a9a21..9ad86d99c4b7d 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.5"; + version = "3.5.1"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; + hash = "sha256-YvgVCviqAuGlT61ANktztzqRYBtROsVrScGMxY6IeEs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 2393ac0ece553..c9b9efeba8906 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,7 +2,7 @@ , python3Packages , gtk3 , cairo -, gnome +, adwaita-icon-theme , librsvg , xvfb-run , dbus @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication rec { ln -s $i $site/icon/out; done - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${adwaita-icon-theme}/share # build the user manual PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { ] ++ documentation_deps; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix index 5be76fa51685f..9f4f17f893c9b 100644 --- a/pkgs/applications/office/pdfmm/default.nix +++ b/pkgs/applications/office/pdfmm/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , ghostscript , locale -, gnome +, zenity , gnused , lib , resholve @@ -35,7 +35,7 @@ resholve.mkDerivation rec { coreutils ghostscript locale - gnome.zenity + zenity gnused ]; fake = { @@ -43,7 +43,7 @@ resholve.mkDerivation rec { external = [ "xmessage" ]; }; execer = [ - "cannot:${gnome.zenity}/bin/zenity" + "cannot:${zenity}/bin/zenity" ]; keep."$toutLu" = true; }; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 53563d72d6584..8003317fc2fb4 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.6.3"; + version = "24.7.0"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-UdWyS5DalnGDoNEOx8d9MglKpJeqOXY1mTgLl3r/9gY="; + hash = "sha256-yDWm6d3kZwBEo0i7CSni4EOA4H+lAuYSzmANi/q7HxU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 27d50caedde05..d2db214a4ef88 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -7,7 +7,7 @@ , atk , gtk3 , gtkspell3 -, gnome +, adwaita-icon-theme , glib , goocanvas2 , gdk-pixbuf @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome.adwaita-icon-theme + adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 98d83f53f2d33..0f4017dbbc07c 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, gnome }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook3, adwaita-icon-theme }: # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-QIkNsFsWeNHEcXhGHHZyJDMMW2lNvdwMJLGxeCZaLdI="; }; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share) - makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share) + makeWrapperArgs+=(--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share) makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped) makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b31ce7f8c2de7..78a335a1b907c 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -30,7 +30,7 @@ , libXrender , libXt , libnotify -, gnome +, adwaita-icon-theme , libGLU , libGL , nspr @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = - [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; + [ gsettings-desktop-schemas glib gtk3 adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/applications/radio/anytone-emu/default.nix index eee3375294db3..337038fd32c2b 100644 --- a/pkgs/applications/radio/anytone-emu/default.nix +++ b/pkgs/applications/radio/anytone-emu/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "Tiny emulator for AnyTone radios"; homepage = "https://github.com/hmatuschek/anytone-emu"; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "anytone-emu"; }; diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 9c131e34bc25e..00aa166d41b0a 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.14"; + version = "2.6.15"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-nsn/pvlFRDGUnm/X5pyzlKWgP6OlfVn3Mdj6vOJZMWQ="; + hash = "sha256-G+PnzyOG/HZ8I66BHdtK0GOUF7ATrTYpzM9sVaSjMDQ="; }; postPatch = '' diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index 96912b95d1838..61663376a02df 100644 --- a/pkgs/applications/radio/flex-ncat/default.nix +++ b/pkgs/applications/radio/flex-ncat/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flex-ncat"; - version = "0.4-20231210.1"; + version = "0.4-20240702"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-oC7TPq+Xsl960B7qJP81cWF+GGc28Miv4L8+1vWo7jA="; + hash = "sha256-ggSQnQfUzceucF2ZtNx6cHy4DW+gu91AdEHrvFciARE="; }; vendorHash = "sha256-1i9v8Ej7TMIO+aMYFPFxdfD4b5j84/zkegaYb67WokU="; diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index ed3fa1715f75c..6217a169ef256 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "GUI application and command line tool for programming DMR radios"; homepage = "https://dm3mat.darc.de/qdmr/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ janik _0x4A6F ]; + maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index aab629aa7c10c..d9b03d0573698 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.34"; + version = "4.2.35"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PwBQmL6CnDp55eLhXr3vpJXf4DcKAwzFSCnzxt5Nob4="; + sha256 = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; }; buildInputs = [ diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 41623bf640dda..50dc0613c743f 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.5.0.0"; + version = "4.6.0.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "sha256-c3YZsSCjZY75jooiqtc8x/xsWTvYm9labUcOydDlSRQ="; + sha256 = "sha256-AwGRkgVbG2gA4K1JG0WPr4v18JHG5YzYUKdJ2EJZX+Y="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/applications/science/biology/iqtree/default.nix index 4dfbaa25b36a4..60827b8e3a685 100644 --- a/pkgs/applications/science/biology/iqtree/default.nix +++ b/pkgs/applications/science/biology/iqtree/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iqtree"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-dnUFllqcABB3JDYoCwPGtIYD/h5lzX2XKOroDpijPpU="; + hash = "sha256-ld+9vPJRVHMEe5/igqRr6RkISY2ipfGkJFHDOSZuAmg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 880ea77e9d245..e8786fe4b9c0e 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-FcefUf0KwAEEn53XubrB2991ncsCMKicf20fJG6LurQ="; + sha256 = "sha256-4lj6Lj9fphzWeZ7I4HP0mpX73OrxY9imCXGyYZuG+kE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix index b2ef121caa9a2..f822fe50b1648 100644 --- a/pkgs/applications/science/biology/trimal/default.nix +++ b/pkgs/applications/science/biology/trimal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trimal"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { repo = pname; owner = "scapella"; rev = "v${version}"; - sha256 = "0isc7s3514di4z953xq53ncjkbi650sh4q9yyw5aag1n9hqnh7k0"; + sha256 = "sha256-6GXirih7nY0eD2XS8aplLcYf53EeLuae+ewdUgBiKQQ="; }; postUnpack = '' diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 1cec011fae33f..4dd8fa743121b 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -7,7 +7,7 @@ , callPackage , callPackages -, gnome +, adwaita-icon-theme , dconf , gtk3 , wxGTK32 @@ -197,7 +197,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook3 did these two as well, no idea if it matters... diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 0be742f76e3c6..28b1b91ae1a24 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.483"; + version = "8.3.486"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-JyawlH/zUTJ7fGf63zHvZ3q8AYRwFELwh+63RN9IkBA="; + sha256 = "sha256-RLAA97roY41imjxehEFzF+peLmrS+rTQkVua+8dxKDY="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 12b01dea1a3dd..6d49ef0ab3f63 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.9.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-mAKuz8WjX+ywQ7Sw5hRMPftsbbilTlmQ9qZVowXxs28="; + sha256 = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 0a81b2a09ef1d..c980e84f9d9f6 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-mPRkkKN7Hz9Qi6a3fEwVFh7a9OaBFcksNw9qwNOarao="; + sha256 = "sha256-7syRpCNL7TRZoJaNrmAdahNy7IyovyniYyOwD/lzhuw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 8f0f88461e653..d07ebd90ec7d1 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -11,7 +11,7 @@ , ocamlPackages_4_14 , ncurses , buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 -, glib, gnome, wrapGAppsHook3, makeDesktopItem, copyDesktopItems +, glib, adwaita-icon-theme, wrapGAppsHook3, makeDesktopItem, copyDesktopItems , csdp ? null , version, coq-version ? null }@args: @@ -154,7 +154,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ optionals buildIde (if coqAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] + then [ ocamlPackages.lablgtk3-sourceview3 glib adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index f85e6cf22879d..93ae5c92b32fe 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,32 +8,37 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-3t0drxM7PZzrLbxBKYa6Gja2u6GK6Pc+ejoswag3P3k="; + hash = "sha256-XoSk08TVv17YyuTsRJ25e6bwSwKIF2+HjF5nFaul8+M="; }; - postPatch = '' - cp ${ - writeScript "fake-gradlew-for-dafny" '' - mkdir -p build/libs/ - javac $(find -name "*.java" | grep "^./src/main") -d classes - jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny - ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew + postPatch = + let + # This file wasn't updated between 4.6.0 and 4.7.0. + runtimeJarVersion = "4.6.0"; + in + '' + cp ${ + writeScript "fake-gradlew-for-dafny" '' + mkdir -p build/libs/ + javac $(find -name "*.java" | grep "^./src/main") -d classes + jar cf build/libs/DafnyRuntime-${runtimeJarVersion}.jar -C classes dafny + ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew - # Needed to fix - # "error NETSDK1129: The 'Publish' target is not supported without - # specifying a target framework. The current project targets multiple - # frameworks, you must specify the framework for the published - # application." - substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ - --replace TargetFrameworks TargetFramework \ - --replace "netstandard2.0;net452" net6.0 - ''; + # Needed to fix + # "error NETSDK1129: The 'Publish' target is not supported without + # specifying a target framework. The current project targets multiple + # frameworks, you must specify the framework for the published + # application." + substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ + --replace-warn TargetFrameworks TargetFramework \ + --replace-warn "netstandard2.0;net452" net6.0 + ''; buildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/applications/science/logic/dafny/deps.nix index 91fe5624ac7f7..0c96fca4ec539 100644 --- a/pkgs/applications/science/logic/dafny/deps.nix +++ b/pkgs/applications/science/logic/dafny/deps.nix @@ -3,18 +3,19 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Boogie"; version = "3.1.3"; sha256 = "0xzc7s0rjb8dhdkdf71g6pdsnyhbl534xpwd8gbx6g16a87iqx6i"; }) - (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.3"; sha256 = "0a7v2jkkbh59pyc5nz4avszm3dbmp4amkmr6lvn0gyc3hxgn8d3k"; }) - (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.3"; sha256 = "1h94yl4ymhd2g14i5w8lnnh2zw7gx65qydzvv8cm8d5yn64gch63"; }) - (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.3"; sha256 = "0b1h1lz997lgyq34bx3ngnhgcrw8j4qvsa6iygb6bydxz7rirrf4"; }) - (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.3"; sha256 = "1aq0gdz1xkmp82c67vrmyvkncfbbj5zxrsg78lsmmi22h9qbkzm3"; }) - (fetchNuGet { pname = "Boogie.Core"; version = "3.1.3"; sha256 = "0yhl272lv9lncjval2z7zl9wavlxx8bivj467zl2zzbrxw2k5wz8"; }) - (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.3"; sha256 = "0p0zp329h6mddbswm3pdcyvy03y69vyznv11ph6bkpya21lsxqy7"; }) - (fetchNuGet { pname = "Boogie.Graph"; version = "3.1.3"; sha256 = "1p8vb4x4iy7f0ycwb8f71j9a2ci8irwg3rvad2hg3rgbihbwp1qj"; }) - (fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.3"; sha256 = "06qlgi9f70r2w7w6h9qw3lx9dd4pbddpdplqjxi090rpry6dhrbz"; }) - (fetchNuGet { pname = "Boogie.Model"; version = "3.1.3"; sha256 = "0fbvnrghaq17fdpjx12axxrrjp1mh99skaznmvxd1ylsqqnn4cbk"; }) - (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.3"; sha256 = "0x7gpc7m04in2gzdn4jgjphd2xjqrdfmh84wzwnwpvi5wyn869jc"; }) - (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.3"; sha256 = "0dyndhqz1yf9qnq9mw73g53rnz0xfbdbi3yk6pg7fdm1m3363h5p"; }) - (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.3"; sha256 = "1bl83727zc1rhskx548p5pa27804n3f5i9n233jvcz6n6bfjn74k"; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.6"; sha256 = "1c6z13dz0sbkmk4ay64aihy7s7xlfdvhpcknxhw1m1b0yly5qj6b"; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.6"; sha256 = "1hxcpc45f32g3jpaw7mg6k9qsppcb3p20wxv4d4dc3nz0r52lrmr"; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.6"; sha256 = "1qk7w7c40fpkvvarbgi1bkdcxpn12r0lqngpwwjw8i7nk84ni5gl"; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.6"; sha256 = "11981gfa0n4s214yilnxqhh1clr4l78iqlws6gv01z1n6rxgbyla"; }) + (fetchNuGet { pname = "Boogie.Core"; version = "3.1.6"; sha256 = "0sgj6i1hvp90g2zfqs1aly500xnv3fq9d4cfgii5kpza8vgm7w4g"; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.6"; sha256 = "08vxxwcnkykcngihkp0bvfwkgwxb3nnqjp5f1vz4bnw708xs0ydg"; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "3.1.6"; sha256 = "0fzj65pnky8i83jj2h9nszij25a46z68fy2sm3pxwlg678nmx2jz"; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.6"; sha256 = "0lfljb9brnr79hp1f0ff6fcy51ml66pjj102jk4pqpmsjwvcjx43"; }) + (fetchNuGet { pname = "Boogie.Model"; version = "3.1.6"; sha256 = "0546b27mxv97v7qilb1carbwip0q7sz9zz7sxizpww6yc3j8w8if"; }) + (fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.1.6"; sha256 = "1x1f35g0kxzhxvw4icmbvkik16py47j6h04gj0ckwbny9qmglaby"; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.6"; sha256 = "0mqlpwfxgv9dd773254rrbgbjb5mpa3xkvlq32ml752h36j8m2r9"; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.6"; sha256 = "0p7axpjn4qg191bs7b33zf9l336bdznvxp3305z2ssnkakjx247h"; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.6"; sha256 = "05z2lr92hbllikv65gh7m3i879fnn6pjn2acf133sijx9b1jixdb"; }) (fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 2ec05098f4078..2c63edc1e7d49 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-R75RrAQb/tRTtMvy/ddLl1KQaA7V71nocvjIS9geMrg="; + hash = "sha256-wi7outnKpz60to6Z7MSGAKK6COxmpJo6iu6Re86jqlo="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index 7b4c85fe9b215..6bca5acb796f6 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-iW2mQPmKfbAWaiEURyVly5IjJ3YpXjVBkm/UbUuwb6k="; + hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 182f6eb81eeb2..50850d4dbf82e 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; # When updating this package, also consider updating science/logic/surelog - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-sl83l6nLN/bluED5bnFShviD1Vv8hmRazxIcLUg/ego="; + hash = "sha256-va8qAzsg589C6rLmG1uIMDr4X30qpBgRO1ZVKdEs5ok="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 9f0b87f011a10..43a00a5e1fbac 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fricas"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "fricas"; repo = "fricas"; rev = version; - sha256 = "sha256-T1xDndDnHq/hmhTWWO3Eu0733u8+C8sJMCF6pbLU2GI="; + sha256 = "sha256-EX/boSs6rK4RrJ5W6Rd0TSHsbQsNiFI1evFuNPBMeu8="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index e4fc506516fdd..a27d7c1ffdb6f 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 (finalAttrs: { pname = "qalculate-gtk"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${finalAttrs.version}"; - hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck="; + hash = "sha256-vH4GZaeQ6Ji9aWh8R5B6PE2fBBW7KTyCsFkpgHu6yg8="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 3c4e19d56ebd7..ba47acb80e03f 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; + hash = "sha256-suJUPeWLX+da0lQdvsDgSBRCBYmog+s4+n/w0PnPijs="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index db2ff0c4a8444..2a6225eab7653 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -6,7 +6,7 @@ , gettext , maxima , wxGTK -, gnome +, adwaita-icon-theme , glib }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs:{ wxGTK maxima # So it won't embed svg files into headers. - gnome.adwaita-icon-theme + adwaita-icon-theme # So it won't crash under Sway. glib ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 25b1f4e5d5ce6..a999a719e2e40 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.3.0"; + version = "4.4.0"; propagatedBuildInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a0+cpT413qi88PvaWQPxKABHfK7vbPE7B42n84n/SAk="; + sha256 = "sha256-LKERjHoIgJ4cF1MjB5nVW3FB/DrmKP4Xj58avsDobhc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index fbe5ee56b3193..928548e7e7183 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doodle"; - version = "0.7.2"; + version = "0.7.3"; buildInputs = [ libextractor gettext ]; src = fetchurl { url = "https://grothoff.org/christian/doodle/download/doodle-${version}.tar.gz"; - sha256 = "sha256-dtRPfUjhBNgN+5zHMYmszISmBv1+K6yjKsbQBiAXWRA="; + sha256 = "sha256-qodp2epYyolg38MNhBV+/NMLmfXjhsn2X9uKTUniv2s="; }; meta = { diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/applications/version-management/deepgit/default.nix index feffc31b759b1..acaf26b2c5c88 100644 --- a/pkgs/applications/version-management/deepgit/default.nix +++ b/pkgs/applications/version-management/deepgit/default.nix @@ -1,7 +1,7 @@ { copyDesktopItems , fetchurl , glib -, gnome +, adwaita-icon-theme , gtk3 , jre , lib @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 jre ]; diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index b749ce8c6e312..e7594eee2f21d 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,20 +20,20 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-Uf0EXaGM4k9Aanz16B9xA2EcseXTI9lLCws/ZVNb3e8="; + hash = "sha256-eRSTF9Ldj00cQbUzHzdMihte0+W4nZ9T/qg/L/yes/w="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; - dotnetInstallFlags = [ "--framework" "net7.0" ]; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnetInstallFlags = [ "--framework" "net8.0" ]; executables = [ "git-credential-manager" ]; runtimeDeps = [ fontconfig ] diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 053da15bd50c0..431c2326cf75d 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,26 +2,26 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.10"; sha256 = "0mvsc6fg8qbvdqkdkia61jkprb3yhvvgvq6s8hgd09v6lzjsbq8n"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; sha256 = "0s2wn7sf0dsa861gh6ghfgf881p6bvyahfpl583rcnsi6ci2hjhv"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; sha256 = "13g5sac0ba8dy1pn21j2g4fin57x1vs1pl07gzgv53bl8nz1xznj"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.10"; sha256 = "0s27ajknbrymnchv66rybrs3snzh825iy0nqby72yk726znp52vw"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; sha256 = "1c7hv9ypvn1ncg6cmzn2cs0nkax0y0pnbx1h1asjzn8rnbwcvnca"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.10"; sha256 = "18f9vpsxfaak4qpqvcz9rdygx3k8dhzb64iqlhva88nhahwlwlxr"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.10"; sha256 = "06pihfddbvdw1s3rs6v183ljch1bsxym80fclfqrh3npa3ag9n1z"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; sha256 = "0p75z6k4ivzhdn9y9gwqsqmja7x03d4mxaicbccjbnz06irybnxa"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.10"; sha256 = "0w45j4ypqnwmsh3byzaghn43ycfkfnn8415i5lw2q5ip7vp3a9fm"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.10"; sha256 = "1jqkwhpvnnbbjwr6992ahlkwgwj7l0k1141317qy1wprirn4mpv1"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; sha256 = "0vssdz6rng0k85qsv2xn6x0dldaalnnx718n7plwxg3j1pddr1z7"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.10"; sha256 = "1gh3fad9ya56qwzhk7590bdzkky76yx1jjj60rqr013b97qbd3gs"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.10"; sha256 = "1x09mp8q3mrj5fijqk7qp5qivrysqnbc2bkj2ssvawb9rjy6497w"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; sha256 = "0i9gaiyjgmcpnfn1fixbxq8shqlh4ahng7j4dxlf38zlln1f6h80"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; sha256 = "0dcmclnyryb82wzsky1dn0gbjsvx84mfx46v984f5fmg4v238lpm"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) @@ -29,14 +29,12 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.54.0"; sha256 = "0p4msajlfbc536qpfnhz2w81rmwgwivfbhdyfk3d198vbadv8zlq"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "2.28.0"; sha256 = "1z2irqbjqxawyxq2778bcjbj0x8m63dh3lj5m04knq48wl4wh40x"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.22.0"; sha256 = "06495i2i9cabys4s0dkaz0rby8k47gy627v9ivp7aa3k6xmypviz"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.60.3"; sha256 = "065iifhffri8wc5i4nfbnkzjrvflav9v5bfkwvmax8f35rks1mnn"; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) @@ -64,21 +62,20 @@ (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; sha256 = "0p0z6nxkkmabv46wmxhs3yr0xy24i6jzn54gk0hsm3h1a8vi3m21"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; sha256 = "05xwa1izzvqz4gznvx2x31qnpvl1lc65hm5p9sscjg5afisya0ss"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; sha256 = "1k2hfasgbv01navc55zzwdwzfxcw4186jni35c00zykgwhbwb250"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) @@ -97,12 +94,11 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index e8efa81e217b2..033b1c1416a1f 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.26.0"; + version = "3.26.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-6q0XunfzURfcvce/BLtJhDeI1fPusN+07S1SegLDkwY="; + hash = "sha256-QcsBe1v2qiPR7svl5mQ/aro/X2PbpkJHNHnNAnQE9yA="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c1373346b6af0..70bd9ab46c4f6 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib -, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, adwaita-icon-theme, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook3, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid @@ -107,7 +107,7 @@ let }) ]; nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # avoid double-wrapping dontWrapGApps = true; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 41fe2756ff47e..e46f414f83d69 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.11.5", - "repo_hash": "1bhg6glb644m55m50q2kp0azf3c4if11vymjn823rhs68jw3jqcp", - "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", + "version": "17.1.1", + "repo_hash": "1ivaicgz4lgl6l06fnr9wfpn71b88yd22ryi3qn2r40rg3vjl1vf", + "yarn_hash": "1xyc3c3hhfp5lgrpacj4gsfbql3wn0brdp16ivnqg4n0csjlizq7", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.11.5-ee", + "rev": "v17.1.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.11.5", - "GITLAB_PAGES_VERSION": "16.11.5", - "GITLAB_SHELL_VERSION": "14.35.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.11.5" + "GITALY_SERVER_VERSION": "17.1.1", + "GITLAB_PAGES_VERSION": "17.1.1", + "GITLAB_SHELL_VERSION": "14.36.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.0.0", + "GITLAB_WORKHORSE_VERSION": "17.1.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 144fd40edd9c6..f43ade4af22a3 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,10 +1,37 @@ -{ stdenv, lib, fetchFromGitLab, bundlerEnv -, ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl -, defaultGemConfig, buildRubyGem -, gitlabEnterprise ? false, callPackage, yarn -, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config -, cargo, rustc, rustPlatform -, icu, zlib, which +{ bundlerEnv +, cacert +, defaultGemConfig +, fetchFromGitLab +, fetchYarnDeps +, fixup-yarn-lock +, git +, gitlabEnterprise ? false +, lib +, makeWrapper +, nettools +, nixosTests +, nodejs +, replace +, ruby_3_2 +, stdenv +, tzdata +, yarn + +# gem dependencies: +# gitlab-glfm-markdown +, buildRubyGem, cargo, rustc, rustPlatform + +# gpgme +, pkg-config + +# openssl +, openssl + +# ruby-magic +, file + +# static-holmes +, icu, which, zlib }: let @@ -20,7 +47,7 @@ let rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; - ruby = ruby_3_1; + ruby = ruby_3_2; gemdir = ./rubyEnv; gemset = import (gemdir + "/gemset.nix") src; gemConfig = defaultGemConfig // { @@ -50,7 +77,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-SncgYYnoSaWA4kQWonoXXbSMu1mnwTyhdLXFagqgH+o="; + hash = "sha256-VYjCYUikORuXx27OYWyumBxeHw9aj/S1wcr9vLIsXeo="; }; dontBuild = false; @@ -75,12 +102,17 @@ let find $out -type f -name .rustc_info.json -delete ''; }; + static_holmes = attrs: { - buildInputs = [ which icu zlib ]; + nativeBuildInputs = [ + icu + which + zlib.dev + ]; }; }; groups = [ - "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" + "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" "opentelemetry" ]; # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a # `console` executable. diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c978c1884577b..eb7499058674f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "16.11.5"; + version = "17.1.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,10 +17,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-iBLRhkFPsopy6m3y+9Qc+v3FCbV5nOWMs+DMwW+JiSk="; + hash = "sha256-c9gLVVRNSkl4RI7LN0UZc6CAzcLIbWGIvsjoiaPdUKY="; }; - vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; + vendorHash = "sha256-yOm0cPC8v6L3gkekUMpf5U86XzpnmeoLTgZSFBb02BA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 6bbd3c555f53c..b2b29cf15a35f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.8.0"; + version = "5.0.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI="; + sha256 = "sha256-856lRCW4+FIiXjOzMkfoYws6SMIKXWVtvr+867QEjCk="; }; - vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM="; + vendorHash = "sha256-2XdbTqNGt97jQUJmE06D6M/VxF9+vJAwMM/fF8MP2oo="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 3cb270e2cae02..655bfe02ca0e3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.11.5"; + version = "17.1.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-mJKzaFICE7f4aIFGeV/4PbbQkaxwmRd9QO2pRXpM2ag="; + hash = "sha256-cwFqzKXDWuIESdDjuPYos73Ly+zd+J20aJJi0RiRdus="; }; - vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; + vendorHash = "sha256-uVpkCl5rSAtg6gDnL3d11AaOlGNpS2xaPtJrthUNbfE="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index e5c669ba3e648..698be436be8f9 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,24 +2,23 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.35.0"; + version = "14.36.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-WyIUdDKPKQE1Ddz40WaMA5lDs37OyDuZl/6/nKDYY/8="; + sha256 = "sha256-SclRIIUZm1D5fYDrTH1L8opQpxxIoi+SrG2GO7wtScU="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch - ./go-mod-tidy.patch ]; - vendorHash = "sha256-7TUHD14/aCs3lkpTy5CH9WYUc1Ud6rDFCx+JgsINvxU="; + vendorHash = "sha256-Ebs9HnHhK4y6+vwLRvVwQnG8I7Gk6leBBezjkc+bhJo="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch deleted file mode 100644 index f7ce8cf0575e5..0000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index 513ccc40..30ba0f6e 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module gitlab.com/gitlab-org/gitlab-shell/v14 - --go 1.20 -+go 1.21 - - require ( - github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240402115927-f0b226fa61cc diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 8bbfd97e00efb..8fdc546cbf36a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -28,8 +28,8 @@ index c6f2422..fb0426b 100644 } func (k *KeyLine) ToString() string { -- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) -+ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id) +- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.ID) ++ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.ID) return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 682376e40a111..2b1677e1b8dc5 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 = "16.11.5"; + version = "17.1.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-44EtpjYsxYqDH035/ruPfshfejiO011HybKD2inp8bU="; + vendorHash = "sha256-7iit/YJHxvrFYfnppwPox+gEAHea7/eq83vMPojWUWU="; 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 dacf2473597cb..d8f93f9280b18 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -24,7 +24,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -gem 'rails', '~> 7.0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rails', '~> 7.0.8.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory @@ -49,12 +49,12 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.11.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.12.1' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs -gem 'pg', '~> 1.5.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'pg', '~> 1.5.6', feature_category: :database -gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory @@ -64,6 +64,9 @@ gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +# For source code paths mapping +gem 'coverband', '6.1.2', require: false, feature_category: :shared + # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory @@ -75,17 +78,13 @@ gem 'ruby-saml', '~> 1.15.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-saml', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-twitter', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. @@ -134,17 +133,17 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API gem 'grape', '~> 2.0.0', feature_category: :api -gem 'grape-entity', '~> 0.10.2', feature_category: :api -gem 'grape-swagger', '~> 2.0.2', group: [:development, :test], feature_category: :api +gem 'grape-entity', '~> 1.0.1', feature_category: :api +gem 'grape-swagger', '~> 2.1.0', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 2.2.5', feature_category: :api +gem 'graphql', '~> 2.3.4', feature_category: :api gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api gem 'graphiql-rails', '~> 1.8.0', feature_category: :api -gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api +gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data @@ -167,7 +166,7 @@ gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory # 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' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'fog-google', '~> 1.19', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-google', '~> 1.24.1', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # NOTE: # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches @@ -207,9 +206,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.191.6' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.197.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.146.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.151.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory @@ -230,7 +229,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.14', feature_category: :team_planning +gem 'gitlab-glfm-markdown', '~> 0.0.17', feature_category: :team_planning # Calendar rendering gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory @@ -256,9 +255,12 @@ gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeat gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared -gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability +gem 'gitlab-sidekiq-fetcher', + path: 'vendor/gems/sidekiq-reliable-fetch', + require: 'sidekiq-reliable-fetch', + feature_category: :scalability # Cron Parser gem 'fugit', '~> 1.8.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -277,7 +279,7 @@ gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 2.0', '>= 2.0.2', feature_category: :static_application_security_testing +gem 'semver_dialects', '~> 3.0', feature_category: :software_composition_analysis gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory @@ -288,13 +290,13 @@ gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis -gem 'redis-namespace', '~> 1.10.0', feature_category: :redis -gem 'redis', '~> 5.0.0', feature_category: :redis -gem 'redis-clustering', '~> 5.0.0', feature_category: :redis +gem 'redis-namespace', '~> 1.11.0', feature_category: :redis +gem 'redis', '~> 5.2.0', feature_category: :redis +gem 'redis-clustering', '~> 5.2.0', feature_category: :redis gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store -gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-actionpack', '~> 5.4.0', feature_category: :redis # Discord integration gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations @@ -353,16 +355,15 @@ gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-license', '~> 2.4', feature_category: :shared +gem 'gitlab-license', '~> 2.5', feature_category: :shared # Protect against bruteforcing gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-raven', '~> 3.1', feature_category: :error_tracking -gem 'sentry-ruby', '~> 5.10.0', feature_category: :error_tracking -gem 'sentry-rails', '~> 5.10.0', feature_category: :error_tracking -gem 'sentry-sidekiq', '~> 5.10.0', feature_category: :error_tracking +gem 'sentry-ruby', '~> 5.17.3', feature_category: :error_tracking +gem 'sentry-rails', '~> 5.17.3', feature_category: :error_tracking +gem 'sentry-sidekiq', '~> 5.17.3', feature_category: :error_tracking # PostgreSQL query parsing # @@ -372,19 +373,18 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop: gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory - -gem 'gitlab-labkit', '~> 0.35.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-labkit', '~> 0.36.0', feature_category: :shared gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n -gem 'rails-i18n', '~> 7.0', feature_category: :internationalization +gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization gem 'gettext_i18n_rails', '~> 1.12.0', feature_category: :internationalization gem 'gettext', '~> 3.4', '>= 3.4.9', require: false, group: [:development, :test], feature_category: :internationalization -gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'batch-loader', '~> 2.0.5' # rubocop:todo Gemfile/MissingFeatureCategory # Perf bar gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -399,6 +399,36 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +# OpenTelemetry +group :opentelemetry do + # Core OpenTelemetry gems + gem 'opentelemetry-sdk', feature_category: :tooling + gem 'opentelemetry-exporter-otlp', feature_category: :tooling + + # OpenTelemetry gems selected from full set in `opentelemetry-instrumentation-all` metagem + gem 'opentelemetry-instrumentation-active_support', feature_category: :tooling + gem 'opentelemetry-instrumentation-action_pack', feature_category: :tooling + gem 'opentelemetry-instrumentation-active_job', feature_category: :tooling + gem 'opentelemetry-instrumentation-active_record', feature_category: :tooling + gem 'opentelemetry-instrumentation-action_view', feature_category: :tooling + gem 'opentelemetry-instrumentation-aws_sdk', feature_category: :tooling + gem 'opentelemetry-instrumentation-http', feature_category: :tooling + gem 'opentelemetry-instrumentation-concurrent_ruby', feature_category: :tooling + gem 'opentelemetry-instrumentation-ethon', feature_category: :tooling + gem 'opentelemetry-instrumentation-excon', feature_category: :tooling + gem 'opentelemetry-instrumentation-faraday', feature_category: :tooling + gem 'opentelemetry-instrumentation-grape', feature_category: :tooling + gem 'opentelemetry-instrumentation-graphql', feature_category: :tooling + gem 'opentelemetry-instrumentation-http_client', feature_category: :tooling + gem 'opentelemetry-instrumentation-net_http', feature_category: :tooling + gem 'opentelemetry-instrumentation-pg', feature_category: :tooling + gem 'opentelemetry-instrumentation-rack', feature_category: :tooling + gem 'opentelemetry-instrumentation-rails', feature_category: :tooling + gem 'opentelemetry-instrumentation-rake', feature_category: :tooling + gem 'opentelemetry-instrumentation-redis', feature_category: :tooling + gem 'opentelemetry-instrumentation-sidekiq', feature_category: :tooling +end + gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do @@ -407,7 +437,7 @@ group :development do gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'lookbook', '~> 2.2', '>= 2.2.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory # Better errors handler gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -416,19 +446,20 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.14.6", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.16.7", require: false, feature_category: :tooling - gem 'ruby-lsp-rails', "~> 0.3.3", feature_category: :tooling + gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling - gem 'gdk-toogle', '~> 0.9', require: 'toogle', feature_category: :tooling + gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parser', '~> 3.3', '>= 3.3.0.5' # rubocop:todo Gemfile/MissingFeatureCategory + # Locked on 3.3.0.5 until inspec-core is updated in Omnibus: https://github.com/inspec/inspec/pull/7030 + gem 'parser', '= 3.3.0.5', feature_category: :shared gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -436,8 +467,8 @@ group :development, :test do gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database - gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec-rails', '~> 6.1.1', feature_category: :shared + gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -445,8 +476,8 @@ group :development, :test do gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling - gem 'haml_lint', '~> 0.53', feature_category: :tooling + gem 'gitlab-styles', '~> 12.0.1', feature_category: :tooling + gem 'haml_lint', '~> 0.58', feature_category: :tooling gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -455,7 +486,7 @@ group :development, :test do gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling gem 'knapsack', '~> 1.22.0', feature_category: :tooling gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling @@ -506,12 +537,12 @@ group :test do gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling + gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'selenium-webdriver', '~> 4.19' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -520,7 +551,7 @@ group :test do gem 'webmock', '~> 3.23.0', feature_category: :shared gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'test-prof', '~> 1.3.2', feature_category: :tooling + gem 'test-prof', '~> 1.3.3', feature_category: :tooling gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling @@ -528,7 +559,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.28.0', require: false, feature_category: :tooling end gem 'octokit', '~> 8.1', feature_category: :importers @@ -563,12 +594,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.11.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 17.0.1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management +gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management -gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'grpc', '~> 1.63', feature_category: :shared gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory @@ -657,9 +688,10 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory # BufferedIO patch # Updating this version will require updating scripts/allowed_warnings.txt gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory -# Lock this until we make DNS rebinding work with the updated net-http: -# https://gitlab.com/gitlab-org/gitlab/-/issues/413528 -gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory + +# This is locked to 0.4.1 because we patch Net::HTTP#connect in +# gems/gitlab-http/lib/net_http/connect_patch.rb. +gem 'net-http', '= 0.4.1', feature_category: :shared gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index bb661693ff498..aa9a829983a80 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -48,6 +48,7 @@ PATH concurrent-ruby (~> 1.2) httparty (~> 0.21.0) ipaddress (~> 0.8.3) + net-http (= 0.4.1) railties (~> 7) PATH @@ -99,7 +100,7 @@ PATH PATH remote: gems/ipynbdiff specs: - ipynbdiff (0.4.7) + ipynbdiff (0.4.8) diffy (~> 3.4) oj (~> 3.13.16) @@ -151,14 +152,6 @@ PATH oauth2 (>= 1.4.4, < 3) PATH - remote: vendor/gems/omniauth-azure-oauth2 - specs: - omniauth-azure-oauth2 (0.0.10) - jwt (>= 1.0, < 3.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.4) - -PATH remote: vendor/gems/omniauth-gitlab specs: omniauth-gitlab (4.0.0) @@ -205,70 +198,70 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.1) - actionpack (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.1) - actionpack (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.1) - activesupport (= 7.0.8.1) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activesupport (= 7.0.8.1) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.1) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -286,7 +279,7 @@ GEM mize tins (~> 1.0) android_key_attestation (0.3.0) - apollo_upload_server (2.1.5) + apollo_upload_server (2.1.6) actionpack (>= 6.1.6) graphql (>= 1.8) app_store_connect (0.29.0) @@ -311,7 +304,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.191.6) + aws-sdk-core (3.197.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -319,8 +312,8 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.146.1) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) @@ -348,7 +341,7 @@ GEM backport (1.2.0) base32 (0.3.2) base64 (0.2.0) - batch-loader (2.0.1) + batch-loader (2.0.5) bcrypt (3.1.18) benchmark (0.2.0) benchmark-ips (2.11.0) @@ -361,6 +354,7 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) + bigdecimal (3.1.7) bindata (2.4.11) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -426,6 +420,8 @@ GEM countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) + coverband (6.1.2) + redis (>= 3.0) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -553,7 +549,7 @@ GEM encryptor (3.0.0) erubi (1.12.0) escape_utils (1.3.0) - et-orbi (1.2.7) + et-orbi (1.2.11) tzinfo ethon (0.16.0) ffi (>= 1.15.0) @@ -633,18 +629,19 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.19.0) - fog-core (< 2.3) + fog-google (1.24.1) + addressable (>= 2.7.0) + fog-core (< 2.5) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-apis-compute_v1 (~> 0.14) - google-apis-dns_v1 (~> 0.12) - google-apis-iamcredentials_v1 (~> 0.6) - google-apis-monitoring_v3 (~> 0.12) - google-apis-pubsub_v1 (~> 0.7) - google-apis-sqladmin_v1beta4 (~> 0.13) - google-apis-storage_v1 (~> 0.6) - google-cloud-env (~> 1.2) + google-apis-compute_v1 (~> 0.53) + google-apis-dns_v1 (~> 0.28) + google-apis-iamcredentials_v1 (~> 0.15) + google-apis-monitoring_v3 (~> 0.37) + google-apis-pubsub_v1 (~> 0.30) + google-apis-sqladmin_v1beta4 (~> 0.38) + google-apis-storage_v1 (>= 0.19, < 1) + google-cloud-env (>= 1.2, < 3.0) fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -670,7 +667,7 @@ GEM googleapis-common-protos-types (>= 1.3.1, < 2.a) googleauth (~> 1.0) grpc (~> 1.36) - gdk-toogle (0.9.3) + gdk-toogle (0.9.5) haml rails (>= 7.0.4.2) gemoji (3.0.1) @@ -687,7 +684,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.11.0.pre.rc1) + gitaly (17.0.2) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -707,22 +704,22 @@ GEM fog-core (~> 2.1) fog-json (~> 1.2) mime-types - gitlab-glfm-markdown (0.0.14) - rb_sys (~> 0.9.86) - gitlab-labkit (0.35.1) + gitlab-glfm-markdown (0.0.17) + rb_sys (= 0.9.94) + gitlab-labkit (0.36.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) - grpc (>= 1.37) + grpc (>= 1.62) jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (>= 4.2.3, < 6.0) redis (> 3.0.0, < 6.0.0) - gitlab-license (2.4.0) - gitlab-mail_room (0.0.24) + gitlab-license (2.5.0) + gitlab-mail_room (0.0.25) jwt (>= 2.0) net-imap (>= 0.2.1) oauth2 (>= 1.4.4, < 3) - redis (>= 4, < 6) + redis (>= 5, < 6) redis-namespace (>= 1.8.2) gitlab-markup (1.9.0) gitlab-net-dns (0.9.2) @@ -730,12 +727,13 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-styles (11.0.0) - rubocop (~> 1.57.1) - rubocop-graphql (~> 0.18) - rubocop-performance (~> 1.15) - rubocop-rails (~> 2.17) - rubocop-rspec (~> 2.22) + gitlab-styles (12.0.1) + rubocop (~> 1.62.1) + rubocop-factory_bot (~> 2.25.1) + rubocop-graphql (~> 1.5.0) + rubocop-performance (~> 1.20.2) + rubocop-rails (~> 2.24.0) + rubocop-rspec (~> 2.27.1) gitlab_chronic_duration (0.12.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -743,11 +741,12 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.21.1) - activesupport (>= 6.1, < 7.2) + gitlab_quality-test_tooling (1.28.0) + activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) http (~> 5.0) + influxdb-client (~> 3.1) nokogiri (~> 1.10) parallel (>= 1, < 2) rainbow (>= 3, < 4) @@ -782,16 +781,16 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-dns_v1 (0.28.0) - google-apis-core (>= 0.9.0, < 2.a) + google-apis-dns_v1 (0.36.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-iam_v1 (0.36.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-iamcredentials_v1 (0.15.0) google-apis-core (>= 0.9.0, < 2.a) - google-apis-monitoring_v3 (0.37.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-pubsub_v1 (0.30.0) - google-apis-core (>= 0.9.1, < 2.a) + google-apis-monitoring_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-pubsub_v1 (0.45.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-serviceusage_v1 (0.28.0) google-apis-core (>= 0.9.1, < 2.a) google-apis-sqladmin_v1beta4 (0.41.0) @@ -852,7 +851,7 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.10.2) + grape-entity (1.0.1) activesupport (>= 3.0.0) multi_json (>= 1.3.2) grape-path-helpers (2.0.1) @@ -860,7 +859,7 @@ GEM grape (~> 2.0) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (2.0.2) + grape-swagger (2.1.0) grape (>= 1.7, < 3.0) rack-test (~> 2) grape-swagger-entity (0.5.1) @@ -877,8 +876,8 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (2.2.5) - racc (~> 1.4) + graphql (2.3.4) + base64 graphql-client (0.19.0) activesupport (>= 3.0) graphql @@ -890,7 +889,7 @@ GEM gemoji (~> 3.0) graphql (~> 2.0) html-pipeline (~> 2.14, >= 2.14.3) - grpc (1.60.0) + grpc (1.63.0) google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) grpc-google-iam-v1 (1.5.0) @@ -916,7 +915,7 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - haml_lint (0.53.0) + haml_lint (0.58.0) haml (>= 5.0) parallel (~> 1.10) rainbow @@ -962,7 +961,7 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - influxdb-client (2.9.0) + influxdb-client (3.1.0) invisible_captcha (2.1.0) rails (>= 5.2) ipaddr (1.2.5) @@ -1011,7 +1010,7 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.4.0) + kas-grpc (0.5.0) grpc (~> 1.0) knapsack (1.22.0) rake @@ -1027,7 +1026,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.6.8) + lefthook (1.6.14) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -1036,7 +1035,7 @@ GEM railties (>= 5.2) rexml libyajl2 (2.1.0) - license_finder (7.0.1) + license_finder (7.1.0) bundler rubyzip (>= 1, < 3) thor (~> 1.2) @@ -1065,7 +1064,7 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.2.2) + lookbook (2.3.1) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1117,11 +1116,10 @@ GEM mustermann-grape (1.0.2) mustermann (>= 1.0.0) nap (1.1.0) - neighbor (0.2.3) - activerecord (>= 5.2) + neighbor (0.3.2) + activerecord (>= 6.1) nenv (0.3.0) - net-http (0.1.1) - net-protocol + net-http (0.4.1) uri net-http-persistent (4.0.1) connection_pool (~> 2.2) @@ -1191,10 +1189,6 @@ GEM omniauth-oauth2 (~> 1) omniauth-azure-activedirectory-v2 (2.0.0) omniauth-oauth2 (~> 1.8) - omniauth-dingtalk-oauth2 (1.0.1) - omniauth-oauth2 (~> 1.7) - omniauth-facebook (4.0.0) - omniauth-oauth2 (~> 1.2) omniauth-github (2.0.1) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8) @@ -1203,9 +1197,6 @@ GEM oauth2 (~> 2.0.6) omniauth (~> 2.0) omniauth-oauth2 (~> 1.8.0) - omniauth-oauth (1.2.0) - oauth - omniauth (>= 1.0, < 3) omniauth-oauth2 (1.8.0) oauth2 (>= 1.4, < 3) omniauth (~> 2.0) @@ -1217,9 +1208,6 @@ GEM ruby-saml (~> 1.12) omniauth-shibboleth-redux (2.0.0) omniauth (>= 2.0.0) - omniauth-twitter (1.4.0) - omniauth-oauth (~> 1.1) - rack omniauth_openid_connect (0.6.1) omniauth (>= 1.9, < 3) openid_connect (~> 1.1) @@ -1237,6 +1225,110 @@ GEM openssl (3.1.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) + opentelemetry-api (1.2.5) + opentelemetry-common (0.21.0) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-otlp (0.27.0) + google-protobuf (~> 3.14) + googleapis-common-protos-types (~> 1.3) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-sdk (~> 1.2) + opentelemetry-semantic_conventions + opentelemetry-helpers-sql-obfuscation (0.1.0) + opentelemetry-common (~> 0.20) + opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-action_view (0.7.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_job (0.7.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_record (0.7.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_support (0.5.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-aws_sdk (0.5.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-base (0.22.3) + opentelemetry-api (~> 1.0) + opentelemetry-registry (~> 0.1) + opentelemetry-instrumentation-concurrent_ruby (0.21.3) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-ethon (0.21.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-excon (0.22.2) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-faraday (0.24.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-grape (0.1.8) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-graphql (0.28.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http (0.23.3) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-net_http (0.22.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-pg (0.27.3) + opentelemetry-api (~> 1.0) + opentelemetry-helpers-sql-obfuscation + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.24.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rails (0.30.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_view (~> 0.7.0) + opentelemetry-instrumentation-active_job (~> 0.7.0) + opentelemetry-instrumentation-active_record (~> 0.7.0) + opentelemetry-instrumentation-active_support (~> 0.5.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rake (0.2.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.5) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sidekiq (0.25.4) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.21.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-registry (0.3.0) + opentelemetry-api (~> 1.1) + opentelemetry-sdk (1.4.1) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.10.0) + opentelemetry-api (~> 1.0) opentracing (0.5.0) optimist (3.0.1) org-ruby (0.9.12) @@ -1264,7 +1356,7 @@ GEM diff-lcs (~> 1.5) expgen (~> 0.1) rainbow (~> 3.1.1) - parallel (1.22.1) + parallel (1.24.0) parser (3.3.0.5) ast (~> 2.4.1) racc @@ -1288,7 +1380,7 @@ GEM prime (0.1.2) forwardable singleton - prism (0.24.0) + prism (0.29.0) proc_to_ast (0.1.0) coderay parser @@ -1337,20 +1429,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.8.1) - actioncable (= 7.0.8.1) - actionmailbox (= 7.0.8.1) - actionmailer (= 7.0.8.1) - actionpack (= 7.0.8.1) - actiontext (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activemodel (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 7.0.8.1) + railties (= 7.0.8.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1361,12 +1453,12 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.3) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) @@ -1376,7 +1468,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.86) + rb_sys (0.9.94) rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) @@ -1388,20 +1480,20 @@ GEM json recursive-open-struct (1.1.3) redcarpet (3.6.0) - redis (5.0.8) - redis-client (>= 0.17.0) + redis (5.2.0) + redis-client (>= 0.22.0) redis-actionpack (5.4.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) - redis-client (0.21.1) + redis-client (0.22.2) connection_pool - redis-cluster-client (0.7.5) - redis-client (~> 0.12) - redis-clustering (5.0.8) - redis (= 5.0.8) - redis-cluster-client (>= 0.7.0) - redis-namespace (1.10.0) + redis-cluster-client (0.8.2) + redis-client (~> 0.22) + redis-clustering (5.2.0) + redis (= 5.2.0) + redis-cluster-client (>= 0.7.11) + redis-namespace (1.11.0) redis (>= 4) redis-rack (3.0.0) rack-session (>= 0.2.0) @@ -1452,7 +1544,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-parameterized (1.0.0) + rspec-parameterized (1.0.2) rspec-parameterized-core (< 2) rspec-parameterized-table_syntax (< 2) rspec-parameterized-core (1.0.0) @@ -1480,51 +1572,49 @@ GEM activerecord get_process_mem rails - rubocop (1.57.2) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.31.2) + parser (>= 3.3.0.4) + rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) - rubocop-graphql (0.19.0) - rubocop (>= 0.87, < 2) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rails (2.22.1) + rubocop-factory_bot (2.25.1) + rubocop (~> 1.41) + rubocop-graphql (1.5.1) + rubocop (>= 0.90, < 2) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.24.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.25.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rspec (2.27.1) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.14.6) + ruby-lsp (0.16.7) language_server-protocol (~> 3.17.0) - prism (>= 0.22.0, < 0.25) + prism (>= 0.29.0, < 0.30) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.3) - actionpack (>= 6.0) - activerecord (>= 6.0) - railties (>= 6.0) - ruby-lsp (>= 0.14.2, < 0.15.0) + ruby-lsp-rails (0.3.6) + ruby-lsp (>= 0.16.5, < 0.17.0) sorbet-runtime (>= 0.5.9897) - ruby-lsp-rspec (0.1.10) - ruby-lsp (~> 0.14.0) + ruby-lsp-rspec (0.1.11) + ruby-lsp (~> 0.16.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1555,25 +1645,24 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.19.0) + selenium-webdriver (4.21.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (2.0.2) + semver_dialects (3.0.1) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.10.0) + sentry-rails (5.17.3) railties (>= 5.0) - sentry-ruby (~> 5.10.0) - sentry-raven (3.1.2) - faraday (>= 1.0) - sentry-ruby (5.10.0) + sentry-ruby (~> 5.17.3) + sentry-ruby (5.17.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.10.0) - sentry-ruby (~> 5.10.0) + sentry-sidekiq (5.17.3) + sentry-ruby (~> 5.17.3) sidekiq (>= 3.0) sexp_processor (4.17.1) shellany (0.0.1) @@ -1673,7 +1762,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.3.2) + test-prof (1.3.3) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -1758,7 +1847,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.11.0) + view_component (3.12.1) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1789,7 +1878,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.23.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1825,7 +1914,7 @@ DEPENDENCIES acts-as-taggable-on (~> 10.0) addressable (~> 2.8) akismet (~> 3.0) - apollo_upload_server (~> 2.1.5) + apollo_upload_server (~> 2.1.6) app_store_connect arr-pm (~> 0.0.12) asciidoctor (~> 2.0.18) @@ -1836,12 +1925,12 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.191.6) - aws-sdk-s3 (~> 1.146.1) + aws-sdk-core (~> 3.197.0) + aws-sdk-s3 (~> 1.151.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) - batch-loader (~> 2.0.1) + batch-loader (~> 2.0.5) bcrypt (~> 3.1, >= 3.1.14) benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) @@ -1861,6 +1950,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.4) countries (~> 4.0.0) + coverband (= 6.1.2) creole (~> 0.5.0) crystalball (~> 0.7.0) cssbundling-rails (= 1.4.0) @@ -1900,24 +1990,24 @@ DEPENDENCIES fog-aliyun (~> 0.4) fog-aws (~> 3.18) fog-core (= 2.1.0) - fog-google (~> 1.19) + fog-google (~> 1.24.1) fog-local (~> 0.8) fugit (~> 1.8.1) fuubar (~> 2.2.0) - gdk-toogle (~> 0.9) + gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.12.0) - gitaly (~> 16.11.0.pre.rc1) + gitaly (~> 17.0.1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.7.0) gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 1.9.1) - gitlab-glfm-markdown (~> 0.0.14) + gitlab-glfm-markdown (~> 0.0.17) gitlab-housekeeper! gitlab-http! - gitlab-labkit (~> 0.35.1) - gitlab-license (~> 2.4) + gitlab-labkit (~> 0.36.0) + gitlab-license (~> 2.5) gitlab-mail_room (~> 0.0.24) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) @@ -1928,11 +2018,11 @@ DEPENDENCIES gitlab-sdk (~> 0.3.0) gitlab-secret_detection! gitlab-sidekiq-fetcher! - gitlab-styles (~> 11.0.0) + gitlab-styles (~> 12.0.1) gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.21.1) + gitlab_quality-test_tooling (~> 1.28.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1952,20 +2042,20 @@ DEPENDENCIES googleauth (~> 1.8.1) gpgme (~> 2.0.23) grape (~> 2.0.0) - grape-entity (~> 0.10.2) + grape-entity (~> 1.0.1) grape-path-helpers (~> 2.0.1) - grape-swagger (~> 2.0.2) + grape-swagger (~> 2.1.0) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8, >= 1.8.4) graphiql-rails (~> 1.8.0) graphlient (~> 0.6.0) graphlyte (~> 1.0.0) - graphql (~> 2.2.5) + graphql (~> 2.3.4) graphql-docs (~> 4.0.0) - grpc (~> 1.60.0) + grpc (~> 1.63) gssapi (~> 1.3.1) guard-rspec - haml_lint (~> 0.53) + haml_lint (~> 0.58) hamlit (~> 2.15.0) hashie (~> 5.0.0) health_check (~> 3.0) @@ -1973,7 +2063,7 @@ DEPENDENCIES html2text httparty (~> 0.21.0) icalendar - influxdb-client (~> 2.9) + influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) @@ -1985,7 +2075,7 @@ DEPENDENCIES jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.4.0) + kas-grpc (~> 0.5.0) knapsack (~> 1.22.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) @@ -1997,7 +2087,7 @@ DEPENDENCIES lockbox (~> 1.3.0) lograge (~> 0.5) loofah (~> 2.22.0) - lookbook (~> 2.2, >= 2.2.2) + lookbook (~> 2.3) lru_redux mail (= 2.8.1) mail-smtp_pool (~> 0.1.0)! @@ -2007,8 +2097,8 @@ DEPENDENCIES mini_magick (~> 4.12) minitest (~> 5.11.0) multi_json (~> 1.14.1) - neighbor (~> 0.2.3) - net-http (= 0.1.1) + neighbor (~> 0.3.2) + net-http (= 0.4.1) net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) @@ -2023,9 +2113,6 @@ DEPENDENCIES omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 3.1) omniauth-azure-activedirectory-v2 (~> 2.0) - omniauth-azure-oauth2 (~> 0.0.9)! - omniauth-dingtalk-oauth2 (~> 1.0) - omniauth-facebook (~> 4.0.0) omniauth-github (= 2.0.1) omniauth-gitlab (~> 4.0.0)! omniauth-google-oauth2 (~> 1.1) @@ -2033,16 +2120,38 @@ DEPENDENCIES omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.1.0) omniauth-shibboleth-redux (~> 2.0) - omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) openid_connect (= 1.3.0) openssl (~> 3.0) + opentelemetry-exporter-otlp + opentelemetry-instrumentation-action_pack + opentelemetry-instrumentation-action_view + opentelemetry-instrumentation-active_job + opentelemetry-instrumentation-active_record + opentelemetry-instrumentation-active_support + opentelemetry-instrumentation-aws_sdk + opentelemetry-instrumentation-concurrent_ruby + opentelemetry-instrumentation-ethon + opentelemetry-instrumentation-excon + opentelemetry-instrumentation-faraday + opentelemetry-instrumentation-grape + opentelemetry-instrumentation-graphql + opentelemetry-instrumentation-http + opentelemetry-instrumentation-http_client + opentelemetry-instrumentation-net_http + opentelemetry-instrumentation-pg + opentelemetry-instrumentation-rack + opentelemetry-instrumentation-rails + opentelemetry-instrumentation-rake + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-sidekiq + opentelemetry-sdk org-ruby (~> 0.9.12) os (~> 1.1, >= 1.1.4) pact (~> 1.64) parallel (~> 1.19) - parser (~> 3.3, >= 3.3.0.5) + parser (= 3.3.0.5) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) @@ -2060,17 +2169,17 @@ DEPENDENCIES rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 7.0.8.1) + rails (~> 7.0.8.4) rails-controller-testing - rails-i18n (~> 7.0) + rails-i18n (~> 7.0, >= 7.0.9) rainbow (~> 3.0) rbtrace (~> 0.4) re2 (= 2.7.0) recaptcha (~> 5.12) - redis (~> 5.0.0) + redis (~> 5.2.0) redis-actionpack (~> 5.4.0) - redis-clustering (~> 5.0.0) - redis-namespace (~> 1.10.0) + redis-clustering (~> 5.2.0) + redis-namespace (~> 1.11.0) request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) @@ -2078,15 +2187,15 @@ DEPENDENCIES rouge (~> 4.2.0) rqrcode (~> 2.2) rspec-benchmark (~> 0.6.0) - rspec-parameterized (~> 1.0) + rspec-parameterized (~> 1.0, >= 1.0.2) rspec-rails (~> 6.1.1) rspec-retry (~> 0.6.2) rspec_junit_formatter rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.14.6) - ruby-lsp-rails (~> 0.3.3) + ruby-lsp (~> 0.16.7) + ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-openai (~> 3.7) @@ -2097,12 +2206,11 @@ DEPENDENCIES sanitize (~> 6.0.2) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 4.19) - semver_dialects (~> 2.0, >= 2.0.2) - sentry-rails (~> 5.10.0) - sentry-raven (~> 3.1) - sentry-ruby (~> 5.10.0) - sentry-sidekiq (~> 5.10.0) + selenium-webdriver (~> 4.21, >= 4.21.1) + semver_dialects (~> 3.0) + sentry-rails (~> 5.17.3) + sentry-ruby (~> 5.17.3) + sentry-sidekiq (~> 5.17.3) shoulda-matchers (~> 5.1.0) sidekiq! sidekiq-cron (~> 1.12.0) @@ -2127,7 +2235,7 @@ DEPENDENCIES tanuki_emoji (~> 0.9) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.3.2) + test-prof (~> 1.3.3) test_file_finder (~> 0.3.1) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -2139,7 +2247,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.11.0) + view_component (~> 3.12.1) vite_rails (~> 3.0.17) vite_ruby (~> 3.5.0) vmstat (~> 2.3.0) @@ -2151,4 +2259,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.8 + 2.5.11 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index dff2917092d8b..f64d8b7daba95 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -13,25 +13,25 @@ src: }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; + sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; + sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; + sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,21 +50,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; + sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; + sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; + sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; + sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; + sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; + sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -133,14 +133,14 @@ src: }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; + sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; + sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -233,10 +233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198k6ikkz6wdnl9i4m569s384sx2r2pyn4l74yvyhz6zdflvwrhg"; + sha256 = "1cnddcnrb0gwhi0w2hrmh53fkpdxxy2v80rfp2q1hrcf4mr41v6w"; type = "gem"; }; - version = "2.1.5"; + version = "2.1.6"; }; app_store_connect = { dependencies = ["activesupport" "jwt"]; @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; + sha256 = "146v6mhf8gma5vmzhz643sddwzhv3acapv7nhaisv4fcsf1lii1l"; type = "gem"; }; - version = "3.191.6"; + version = "3.197.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; + sha256 = "023h9xx65dd91z1sk9znhfwp4wr48imnnhdhvczv64m17r7ych4y"; type = "gem"; }; - version = "1.146.1"; + version = "1.151.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -538,10 +538,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d8wwj880zar5h8zxdmw878shgmljmmv957802fw5nkg3gi3xwk"; + sha256 = "04zjpzb2m1qjxk0lzdi5m812wyq5kkwcdbxs1asbm67lp0wgcjwn"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.5"; }; bcrypt = { groups = ["default"]; @@ -625,6 +625,16 @@ src: }; version = "2.10.1"; }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + type = "gem"; + }; + version = "3.1.7"; + }; bindata = { groups = ["default"]; platforms = []; @@ -978,6 +988,17 @@ src: }; version = "4.0.1"; }; + coverband = { + dependencies = ["redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cms6ppz367fqfynyzjdsy1lqrxkrh6vvfzznrw3mxhz1xmkb7wp"; + type = "gem"; + }; + version = "6.1.2"; + }; crack = { dependencies = ["safe_yaml"]; groups = ["default" "test"]; @@ -1599,10 +1620,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; ethon = { dependencies = ["ffi"]; @@ -1973,15 +1994,15 @@ src: version = "2.1.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; + dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-apis-compute_v1" "google-apis-dns_v1" "google-apis-iamcredentials_v1" "google-apis-monitoring_v3" "google-apis-pubsub_v1" "google-apis-sqladmin_v1beta4" "google-apis-storage_v1" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "127l22c7lhg166sylfhxys41p0i3nlkxkpzzgw8q9zip10irm41w"; + sha256 = "1q2qhdkz7axp1f853d3jxx852gj5idrqhypxk8k3zm9fs72lxmnw"; type = "gem"; }; - version = "1.19.0"; + version = "1.24.1"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -2085,10 +2106,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gzf4b6y5v0d5pbc0lq33383m3c8y8kq5yy57124lb9bblymszw9"; + sha256 = "0jfjp87f4zi5jp8ydwabvfz3dv115ickaaasbs8c096kfqjrgf1q"; type = "gem"; }; - version = "0.9.3"; + version = "0.9.5"; }; gemoji = { groups = ["default" "development" "test"]; @@ -2150,10 +2171,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bp7lsqhcmb1fi1wsij1gbl0ip9jcwmzxagfg39c7dnm7xglycr4"; + sha256 = "10ms9zz9j1zvabgdldpsn0s8g7v8q7vn3dkyvzh551iijzqcvlgc"; type = "gem"; }; - version = "16.11.0.pre.rc1"; + version = "17.0.2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2226,10 +2247,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0finxlax2pgxw85qnyz3p4pmi8dz6qj8bsjkrkrnkd93k41lyfcn"; + sha256 = "0sdaq9av30761h9x7kjwmwri22265x1dnpq24law6w9sqmgm8ygk"; type = "gem"; }; - version = "0.0.14"; + version = "0.0.17"; }; gitlab-housekeeper = { dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; @@ -2242,7 +2263,7 @@ src: version = "0.1.0"; }; gitlab-http = { - dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "railties"]; + dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "net-http" "railties"]; groups = ["default"]; platforms = []; source = { @@ -2257,20 +2278,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m41by1hly50yq9vsz5pbrb51yryf46n9pm7wnrinaisccrinl79"; + sha256 = "10gr7886pphgxg8ja1axba022l0b1c5mvqi1hfdhrvbh70f1vwim"; type = "gem"; }; - version = "0.35.1"; + version = "0.36.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "082ycgvq7j0kyqrbx8shipqk3lgz6i279caf1ljvk9h5wsqqy8zx"; + sha256 = "0k9zaybfzp7q8w07ghf44q3yngxyrr68l623r9v7il9aki36q5jc"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; gitlab-mail_room = { dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"]; @@ -2278,10 +2299,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1crw7k0mdzkrc94xw901dlmzzhhaa8a2bxyvk2y29h5w7pvkvgy7"; + sha256 = "06ivc4cbr5lc6lja947flzlppp3d9s44fwd3x8an0yvrq31yfg12"; type = "gem"; }; - version = "0.0.24"; + version = "0.0.25"; }; gitlab-markup = { groups = ["default"]; @@ -2375,15 +2396,15 @@ src: version = "0.11.0"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-factory_bot" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ss0p7al6vyf5qwzyfbgaaxpa3ykvszwc5in3p2mm5g9dh3frn0d"; + sha256 = "0cyi9sccg1h7ia12i9jwbq5ygic53c7pc08ms7i1h7qfmfq058yq"; type = "gem"; }; - version = "11.0.0"; + version = "12.0.1"; }; gitlab-utils = { dependencies = ["actionview" "activesupport" "addressable" "rake"]; @@ -2418,15 +2439,15 @@ src: version = "2.2.0"; }; gitlab_quality-test_tooling = { - dependencies = ["activesupport" "amatch" "gitlab" "http" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; + dependencies = ["activesupport" "amatch" "gitlab" "http" "influxdb-client" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g4fsldxs63ds31sni422xk0g3yrr9jpga0bah5ip4hys8as3wl3"; + sha256 = "1wsizq4hxcwkd8si14q7hb8rxh9hygpm3s7s0f8cyz2b62ycdcnh"; type = "gem"; }; - version = "1.21.1"; + version = "1.28.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2533,10 +2554,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7k1nanm4wqyx19m5x9xzzm3nvf89gg5vr1dq4nfyvkl8g668zm"; + sha256 = "0ivx6km85mlycb11x2rbkyg3kl4syy3730q7pk8h6zdkibbp7ljx"; type = "gem"; }; - version = "0.28.0"; + version = "0.36.0"; }; google-apis-iam_v1 = { dependencies = ["google-apis-core"]; @@ -2566,10 +2587,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skk42y2y81jlj0qfk790wqz3sdaxrykrc4mp1ysr0zsinp654id"; + sha256 = "0a31sid7p4qn4m1gcq8z1bsqdyzzc84h4frh2dw97k5lwpff2zv7"; type = "gem"; }; - version = "0.37.0"; + version = "0.54.0"; }; google-apis-pubsub_v1 = { dependencies = ["google-apis-core"]; @@ -2577,10 +2598,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gg1br0pj16iag3xax942g101zk4rk48isdpz5abyhc070amk45q"; + sha256 = "01dj7jx6dfyl4wz88nn7ml45qvck6khl7gli8h6hl9c1qwa4dzhx"; type = "gem"; }; - version = "0.30.0"; + version = "0.45.0"; }; google-apis-serviceusage_v1 = { dependencies = ["google-apis-core"]; @@ -2784,10 +2805,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wdm44s7l6jxqszybf58ar7699vlq7vj2zfsi8f9sh9mh5a89dcy"; + sha256 = "0d16s18k34crhyc44ycj062y81sdahgp8pcll9xggbq7wja9w3z0"; type = "gem"; }; - version = "0.10.2"; + version = "1.0.1"; }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; @@ -2806,10 +2827,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "018843mknkjs1ybazs7b8k7k0g67m1ldc42z8vlb5yinp9b9l4x7"; + sha256 = "07i1rl07ra81j4zhz7i8f34ja4dgaksdp5rjgmznk332040k2jxn"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; grape-swagger-entity = { dependencies = ["grape-entity" "grape-swagger"]; @@ -2866,15 +2887,15 @@ src: version = "1.0.0"; }; graphql = { - dependencies = ["racc"]; + dependencies = ["base64"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmw8gslwqaydxvmvan0m2rpbgxplm77kwp64bg051cvnasb9vhm"; + sha256 = "0df94lkqsis1kqgjch12mkm8fh55d6s1lqp2fvjj6xr310v323q2"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.4"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2904,10 +2925,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bzkhy5yy4a8nlp89wwfw9bv4h358gsa9rvzn6i2y0z2ha5vmgqn"; + sha256 = "11ink0ayf14qgs3msn5a7dpg49vm3ck2415r64nfk1i8xv286hsz"; type = "gem"; }; - version = "1.60.0"; + version = "1.63.0"; }; grpc-google-iam-v1 = { dependencies = ["google-protobuf" "googleapis-common-protos" "grpc"]; @@ -2980,10 +3001,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "060vz5dx0ag3ggpwhwfcadfim0g8aabl0b1dvnzagizymfsw2g92"; + sha256 = "1mf24djxk6968n0ypwbib790nzijcf03m4kw0dnks8csfxj6hy9g"; type = "gem"; }; - version = "0.53.0"; + version = "0.58.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -3221,10 +3242,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00lzkgzr6zmnlbqcfsb38b4d3762wslx0v32nsy6052jksvas7xm"; + sha256 = "1j01r3rhai3h0bgq7npi49xz6ahm5sj6zag8b0l3amdxp82wb7ay"; type = "gem"; }; - version = "2.9.0"; + version = "3.1.0"; }; invisible_captcha = { dependencies = ["rails"]; @@ -3265,7 +3286,7 @@ src: path = "${src}/gems/ipynbdiff"; type = "path"; }; - version = "0.4.7"; + version = "0.4.8"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -3433,10 +3454,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13bkqrdz1rdn23nn0zni7vdvwnm34apgi3xy42djhhxl698888dv"; + sha256 = "0dffbnw10hld4vpack6xw14n590b9fgqv5cxgap3f7qzzdd6yybc"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; knapsack = { dependencies = ["rake"]; @@ -3508,10 +3529,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08y6f6f4nhg4dc96rbawhjjalxn0chzvvza5d8qfzsac6zl83094"; + sha256 = "1rbw6vr1chabkd0p3sqxcpva77vxgk3a1pzrv7h4m73jx4bixdbq"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.14"; }; letter_opener = { dependencies = ["launchy"]; @@ -3551,10 +3572,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb"; + sha256 = "0v66fb85majc816qip42kbwcn41lr6rm5w6zim4a2kgp74v0n0kd"; type = "gem"; }; - version = "7.0.1"; + version = "7.1.0"; }; licensee = { dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; @@ -3637,10 +3658,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxnshqv3xv3hprnn4rsqq0djrqpmfcr7x8qmwy6p91g7yqhkhx5"; + sha256 = "0ffwg0lnvzfaxp9z7gynll1d4hlxm4ma2c05qcwqrznj7d7jkfnn"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.1"; }; lru_redux = { groups = ["default"]; @@ -3960,10 +3981,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9k34xz7x7fpd18bix0cd5bk2wv6mj8z67f8fr7l30d2717m23h"; + sha256 = "1a7bwycd8svpxp5plnm84iyn1cxhc4s7msgpv61axfdi4k6bp5dp"; type = "gem"; }; - version = "0.2.3"; + version = "0.3.2"; }; nenv = { groups = ["default" "test"]; @@ -3976,15 +3997,15 @@ src: version = "0.3.0"; }; net-http = { - dependencies = ["net-protocol" "uri"]; + dependencies = ["uri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mymfxpsgpwr1qbv8vwj8av9kksqj0632p9s3x35bzrnq4y393m"; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; type = "gem"; }; - version = "0.1.1"; + version = "0.4.1"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -4263,38 +4284,6 @@ src: }; version = "2.0.0"; }; - omniauth-azure-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - path = "${src}/vendor/gems/omniauth-azure-oauth2"; - type = "path"; - }; - version = "0.0.10"; - }; - omniauth-dingtalk-oauth2 = { - dependencies = ["omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5"; - type = "gem"; - }; - version = "1.0.1"; - }; - omniauth-facebook = { - dependencies = ["omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5"; - type = "gem"; - }; - version = "4.0.0"; - }; omniauth-github = { dependencies = ["omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -4327,17 +4316,6 @@ src: }; version = "1.1.1"; }; - omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; - type = "gem"; - }; - version = "1.2.0"; - }; omniauth-oauth2 = { dependencies = ["oauth2" "omniauth"]; groups = ["default"]; @@ -4392,17 +4370,6 @@ src: }; version = "2.0.0"; }; - omniauth-twitter = { - dependencies = ["omniauth-oauth" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; - type = "gem"; - }; - version = "1.4.0"; - }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; groups = ["default"]; @@ -4466,6 +4433,324 @@ src: }; version = "1.3.0"; }; + opentelemetry-api = { + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j9c2a4wgw0jaw63qscfasw3lf3kr45q83p4mmlf0bndcq2rlgdb"; + type = "gem"; + }; + version = "1.2.5"; + }; + opentelemetry-common = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "160ws06d8mzx3hwjss2i954h8r86dp3sw95k2wrbq81sb121m2gy"; + type = "gem"; + }; + version = "0.21.0"; + }; + opentelemetry-exporter-otlp = { + dependencies = ["google-protobuf" "googleapis-common-protos-types" "opentelemetry-api" "opentelemetry-common" "opentelemetry-sdk" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k4y30x7l29kgkydn966qcwvf35phx0c9n3c2zinw64pvrmcyl00"; + type = "gem"; + }; + version = "0.27.0"; + }; + opentelemetry-helpers-sql-obfuscation = { + dependencies = ["opentelemetry-common"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cnlr3gqmd2q9wcaxhvlkxkbjvvvkp4vzcwif1j7kydw7lvz2vmw"; + type = "gem"; + }; + version = "0.1.0"; + }; + opentelemetry-instrumentation-action_pack = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16nbkayp8jb2zkqj2rmqd4d1mz4wdf0zg6jx8b0vzkf9mxr89py5"; + type = "gem"; + }; + version = "0.9.0"; + }; + opentelemetry-instrumentation-action_view = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xfbqgw497k2f56f68k7zsvmrrk5jk69xhl56227dfxlw15p2z5w"; + type = "gem"; + }; + version = "0.7.0"; + }; + opentelemetry-instrumentation-active_job = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12c0qr980zr4si2ps55aj3zj84zycg3zcf16nh6mizljkmn8096s"; + type = "gem"; + }; + version = "0.7.1"; + }; + opentelemetry-instrumentation-active_record = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjfd1dmfzcnvss2jsnc2s3g6p0wfq5ay3vfnidkmisgyw7fphfk"; + type = "gem"; + }; + version = "0.7.2"; + }; + opentelemetry-instrumentation-active_support = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rjajgb7sj3mrw5d79xm7q3f4mns1fc3ngasjfw10i18x0kq7283"; + type = "gem"; + }; + version = "0.5.1"; + }; + opentelemetry-instrumentation-aws_sdk = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "191p0d0yvlwakppzhfq7nkakbz4psby0h0bgx8p5apdc7vz2mmmr"; + type = "gem"; + }; + version = "0.5.2"; + }; + opentelemetry-instrumentation-base = { + dependencies = ["opentelemetry-api" "opentelemetry-registry"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pv064ksiynin8hzvljkwm5vlkgr8kk6g3qqpiwcik860i7l677n"; + type = "gem"; + }; + version = "0.22.3"; + }; + opentelemetry-instrumentation-concurrent_ruby = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xmx1rxdvf835kvad352rcavwkk3x758q0rznx2npay3mm8bbcbg"; + type = "gem"; + }; + version = "0.21.3"; + }; + opentelemetry-instrumentation-ethon = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h5sa5in4b5yh8xgsgpk2spzhvkakinyi81mccgfy39zvz1p1i1i"; + type = "gem"; + }; + version = "0.21.5"; + }; + opentelemetry-instrumentation-excon = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0im1ljdz4xd2498ss919gsqmv8r4ipk4rkwhf8ai0diw58qwa78p"; + type = "gem"; + }; + version = "0.22.2"; + }; + opentelemetry-instrumentation-faraday = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3hx6linkdwmy5pax0khm64w68d2c7536yzc3svppivhxnfank9"; + type = "gem"; + }; + version = "0.24.3"; + }; + opentelemetry-instrumentation-grape = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c33cg6a2ykpc5215v1a1pqhvad5wld6pz0m32zxhai5psxj3110"; + type = "gem"; + }; + version = "0.1.8"; + }; + opentelemetry-instrumentation-graphql = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13lbvcbszr20b7li8mm007rnm59np5y7zz5a36jchbz8503dhfai"; + type = "gem"; + }; + version = "0.28.2"; + }; + opentelemetry-instrumentation-http = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yncpv6i2cagjyq1srdqddf6mh0q9s04kfi9q1rh9qbsxqbp5cff"; + type = "gem"; + }; + version = "0.23.3"; + }; + opentelemetry-instrumentation-http_client = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "038bpsg4bfix3ap7l9f8jqkb1acl3v0p7c2jd7bj1116v4ycdcvc"; + type = "gem"; + }; + version = "0.22.5"; + }; + opentelemetry-instrumentation-net_http = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gppqpy2c48xj2jlcd1lkmr3wh3qhwf14337wjk2w0qq77h11gcr"; + type = "gem"; + }; + version = "0.22.5"; + }; + opentelemetry-instrumentation-pg = { + dependencies = ["opentelemetry-api" "opentelemetry-helpers-sql-obfuscation" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k9m9v4i42y53s85b8y7vz4dj4y00v1gg8392rkrswl5f72fk2dn"; + type = "gem"; + }; + version = "0.27.3"; + }; + opentelemetry-instrumentation-rack = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dc2ds4vaqybfpzp98p79z9kgpdagljsgbjbhpi0i9jrlh2xnddy"; + type = "gem"; + }; + version = "0.24.4"; + }; + opentelemetry-instrumentation-rails = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hiihby0lndwvny1alba1mvvag48z55vjjrwbjppb700prv0q1kk"; + type = "gem"; + }; + version = "0.30.1"; + }; + opentelemetry-instrumentation-rake = { + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0840gnlr90nbl430yc72czn26bngdp94v4adz7q9ph3pmdm8mppv"; + type = "gem"; + }; + version = "0.2.2"; + }; + opentelemetry-instrumentation-redis = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mrkcd8mdvfgrqalnav4dh3hvd1f91yq718n1mdb56jkd607kknp"; + type = "gem"; + }; + version = "0.25.5"; + }; + opentelemetry-instrumentation-sidekiq = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18x3x06dfydaqqab4k6yykqhy2axppyf9q63sh2da893jphb5qac"; + type = "gem"; + }; + version = "0.25.4"; + }; + opentelemetry-registry = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08k8zqrg47v1jxcvxz9wxyqm03kjdw98qa8q0y840qvh988vcshi"; + type = "gem"; + }; + version = "0.3.0"; + }; + opentelemetry-sdk = { + dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-registry" "opentelemetry-semantic_conventions"]; + groups = ["opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ajf9igx63r6r2ds0f3hxd18iragvr88k2k9kzvamp1jkdna6gsi"; + type = "gem"; + }; + version = "1.4.1"; + }; + opentelemetry-semantic_conventions = { + dependencies = ["opentelemetry-api"]; + groups = ["default" "opentelemetry"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xhv5fwwgjj2k8ksprpg1nm5v8k3w6gyw4wiq2k08q3kf484rlhk"; + type = "gem"; + }; + version = "1.10.0"; + }; opentracing = { groups = ["default"]; platforms = []; @@ -4555,10 +4840,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv"; type = "gem"; }; - version = "1.22.1"; + version = "1.24.0"; }; parser = { dependencies = ["ast" "racc"]; @@ -4682,10 +4967,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji"; + sha256 = "0ps7lydh1jsqv02vmb1lgky80hi8wcvbv6lfybxgb9q80cx88b55"; type = "gem"; }; - version = "0.24.0"; + version = "0.29.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -4925,14 +5210,14 @@ src: }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; - groups = ["default" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; + sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4973,10 +5258,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lrbrx88ic42adcj36wip3dk1svmqld1f7qksngi4b9kqnc8w5g3"; + sha256 = "0s8kvic2ia34ngssz6h15wqj0k3wwblhyh0f9v0j3gy7ly0dp161"; type = "gem"; }; - version = "7.0.3"; + version = "7.0.9"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; @@ -4984,10 +5269,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; + sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0"; type = "gem"; }; - version = "7.0.8.1"; + version = "7.0.8.4"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -5035,10 +5320,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131sa2jvc7b1yld3nzc0xq7lvwvql7b8c09i0xv2brzjybammlv5"; + sha256 = "1jjcxfwwr70l46wylv68mjnazi4zfwn7fn5yb2wnfs4hwzcbwdca"; type = "gem"; }; - version = "0.9.86"; + version = "0.9.94"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -5119,10 +5404,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7k4sgx5vzsigp8c15flz4fclqy4j2a33vim7b2c2w5jyjhwxrv"; + sha256 = "1d1ng78dwbzgfg1sljf9bnx2km5y3p3jc42a9npwcrmiard9fsrk"; type = "gem"; }; - version = "5.0.8"; + version = "5.2.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -5141,10 +5426,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irk5j73aqhyv54q3vs88y5rp9a5fkvbdif7zn5q7m5d51h2375w"; + sha256 = "1h5cgdv40zk0ph1nl64ayhn6anzwy6mbxyi7fci9n404ryvy9zii"; type = "gem"; }; - version = "0.21.1"; + version = "0.22.2"; }; redis-cluster-client = { dependencies = ["redis-client"]; @@ -5152,10 +5437,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12p7wi39zaldk8lr484j4j6w49502fxayinfs9f7l58pvag1rz8j"; + sha256 = "107ban04brh3f6xwy4rcy83a6kgq0r71jdfyjz95ggg2hs51pv8w"; type = "gem"; }; - version = "0.7.5"; + version = "0.8.2"; }; redis-clustering = { dependencies = ["redis" "redis-cluster-client"]; @@ -5163,10 +5448,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rp1yrqpvi29ar6mlqsyk36nxgh1drijb4f5xa76c057n7iksbwf"; + sha256 = "13h3w100848y272vykm1bwyj29z749pa9sfcjqd0k0fx1f73hpv8"; type = "gem"; }; - version = "5.0.8"; + version = "5.2.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -5174,10 +5459,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154dfnrjpbv7fhwhfrcnp6jn9qv5qaj3mvlvbgkl7qy5qsknw71c"; + sha256 = "0f92i9cwlp6xj6fyn7qn4qsaqvxfw4wqvayll7gbd26qnai1l6p9"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; redis-rack = { dependencies = ["rack-session" "redis-store"]; @@ -5408,10 +5693,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww"; + sha256 = "1hplygik9p5d92lhb9412lzap8msrmry2qrrq5d1f90r170dwmml"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; rspec-parameterized-core = { dependencies = ["parser" "proc_to_ast" "rspec" "unparser"]; @@ -5495,10 +5780,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06qnp5zs233j4f59yyqrg8al6hr9n4a7vcdg3p31v0np8bz9srwg"; + sha256 = "0daamn13fbm77rdwwa4w6j6221iq6091asivgdhk6n7g398frcdf"; type = "gem"; }; - version = "1.57.2"; + version = "1.62.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -5506,10 +5791,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; + sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w"; type = "gem"; }; - version = "1.29.0"; + version = "1.31.2"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -5517,10 +5802,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwwi5a05947q9zsk6i599zxn657hdphbmmbbpx17qsv307rwcps"; + sha256 = "0f5r9di123hc4x2h453a143986plfzz9935bwc7267wj8awl8s1a"; type = "gem"; }; - version = "2.19.0"; + version = "2.20.0"; }; rubocop-factory_bot = { dependencies = ["rubocop"]; @@ -5528,10 +5813,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y79flwjwlaslyhfpg84di9n756ir6bm52n964620xsj658d661h"; + sha256 = "0d012phc7z5h1j1d2aisnbkmqlb95sld5jriia5qg2gpgbg1nxb2"; type = "gem"; }; - version = "2.24.0"; + version = "2.25.1"; }; rubocop-graphql = { dependencies = ["rubocop"]; @@ -5539,10 +5824,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hryrjmcl04br06ibjzzrbb2am8ybbhnl2l7w13xl3wz3k4jyjxs"; + sha256 = "1sw242bz2al9c1arprim9pd0kks8wbla77kkjvwp7kp1m01dc0lm"; type = "gem"; }; - version = "0.19.0"; + version = "1.5.1"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5550,21 +5835,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pzsrnjmrachdjxzl9jpw47cydicn3408vgdg3a4bss4v5r42rjj"; + sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.2"; }; rubocop-rails = { - dependencies = ["activesupport" "rack" "rubocop"]; + dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0imxmki4qc5pji31wn491smaq531ncngnv6d4xvbpn11cgdkqryv"; + sha256 = "06dcxrr71sn0kkw8fwh0w884zbig2ilxpkl66s7lcis9jmkggv83"; type = "gem"; }; - version = "2.22.1"; + version = "2.24.1"; }; rubocop-rspec = { dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; @@ -5572,10 +5857,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wwrgcigdrrlgg4nwbl18qfyjks519kqbbly5adrdffvh428lgq8"; + sha256 = "17ksg89i1k5kyhi241pc0zyzmq1n7acxg0zybav5vrqbf02cw9rg"; type = "gem"; }; - version = "2.25.0"; + version = "2.27.1"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5594,21 +5879,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ja3ag2q0w8xsbf25sf2x98gvdia534ld2m8hn1bfwzhwb5ysfsl"; + sha256 = "0730631afd1iadx51izm2adygwqd7aii95gdmy405d847x35bmf3"; type = "gem"; }; - version = "0.14.6"; + version = "0.16.7"; }; ruby-lsp-rails = { - dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; + dependencies = ["ruby-lsp" "sorbet-runtime"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrb39svnd8v6vnd3vyzsby6qr0z28cj0v9r02hcjvadm2p67g03"; + sha256 = "1pdr6ir97af633lg0dkdasjflfmrlf50ad4x4jq7a712x4p1fxag"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.6"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5616,10 +5901,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0npxb9146yqfwpyx3bw375q8vx60ph2zgbvpai1dmgq8dfs3idki"; + sha256 = "11nc5ysf3rq47v7h9v17ivmca62bj7lm6x80fy5fpj45vxh7pz1l"; type = "gem"; }; - version = "0.1.10"; + version = "0.1.11"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -5805,10 +6090,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjh9s5x7jqaxjfcz2m3hphhlajk9nxs6wdsnia62iba07bd32sc"; + sha256 = "0qrjr30qs01b27km6ipzc2zasdlzhdgri5q7qrb53z1j8l0n82y3"; type = "gem"; }; - version = "4.19.0"; + version = "4.21.1"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -5816,10 +6101,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zhnq4wkcy8vv6qazfg0p3zrlswxhz9glqnq2991p4vg86grq1b0"; + sha256 = "0d9q502kp1az64lk0psblgdi50s5mr8x8g8k19avivkna0v5z6fs"; type = "gem"; }; - version = "2.0.2"; + version = "3.0.1"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -5827,32 +6112,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gby2dx2h487y8ziisy57ba8mj6scpg6az49n4p989kc2fn2zalr"; - type = "gem"; - }; - version = "5.10.0"; - }; - sentry-raven = { - dependencies = ["faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h"; + sha256 = "0ncl8br0k6fas4n6c4xw4wr59kq5s2liqn1s4790m73k5p272xq1"; type = "gem"; }; - version = "3.1.2"; + version = "5.17.3"; }; sentry-ruby = { - dependencies = ["concurrent-ruby"]; + dependencies = ["bigdecimal" "concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "069n32qqhhv91slyvzh92vqw3gp232qqz652yc894c71mv028p0i"; + sha256 = "1z5v5zzasy04hbgxbj9n8bb39ayllvps3snfgbc5rydh1d5ilyb1"; type = "gem"; }; - version = "5.10.0"; + version = "5.17.3"; }; sentry-sidekiq = { dependencies = ["sentry-ruby" "sidekiq"]; @@ -5860,10 +6134,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06pagbphvmwp8yk3rcnhl7mbnc0hnvhcjhanzgiipyrk0y6h30fc"; + sha256 = "0n1cr9g15hp08jsqabprd6q34ap61r71f33x28w1xr4ri4hllwfh"; type = "gem"; }; - version = "5.10.0"; + version = "5.17.3"; }; sexp_processor = { groups = ["default" "test"]; @@ -6361,10 +6635,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zw1y52yhzw2z01za87dglpfpdrm1dma00629wpq6462nxq9574"; + sha256 = "0rwnq67qm2ngz066sncvg0dv65bsk29qz3xarbv8qan2hi7yw0qg"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6802,10 +7076,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zy51z0whkm3fdpsbi8v4j8h5h3ia1zkc2j28amiznpqqvfc7539"; + sha256 = "12xi88jvx49p15nx2168wm0r00g90mb4cxzzsjxz92akjk92mkpj"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.1"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6899,10 +7173,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07zk8ljq5kyd1mm9qw3452fcnf7frg3irh9ql8ln2m8zbi1qf1qh"; + sha256 = "158d2ikjfzw43kgm095klp43ihphk0cv5xjprk44w73xfv03i9qg"; type = "gem"; }; - version = "3.23.0"; + version = "3.23.1"; }; webrick = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f5e66083553cb..681da8792f397 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -13,6 +13,7 @@ , gtk3 , gtksourceview4 , gnome +, adwaita-icon-theme , gsettings-desktop-schemas }: @@ -44,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtksourceview4 gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index bc88c24814678..a19f03727023b 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -3,7 +3,7 @@ , wrapGAppsHook3 , cairo , glib -, gnome +, gnome-common , gst_all_1 , gtk3 , intltool @@ -37,7 +37,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ which - gnome.gnome-common + gnome-common glib libtool cairo diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 78bfaa2b46373..12a66c90e8d54 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clapper"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = "clapper"; rev = finalAttrs.version; - hash = "sha256-5fD1OnVcY3ZC+QfoFqe2jV43/J36r85SpLUYF2ti7dY="; + hash = "sha256-IQJTnLB6FzYYPONOqBkvi89iF0U6fx/aWYvNOOJpBvc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix deleted file mode 100644 index 80892b96c94b6..0000000000000 --- a/pkgs/applications/video/coriander/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, glib -, gtk2 -, libgnomeui -, libXv -, libraw1394 -, libdc1394 -, SDL -, automake -, GConf -}: - -stdenv.mkDerivation rec { - pname = "coriander"; - version = "2.0.1"; - - src = fetchurl { - url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-${version}.tar.gz"; - 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 - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - cp ${automake}/share/automake-*/mkinstalldirs . - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; - - meta = { - homepage = "https://damien.douxchamps.net/ieee1394/coriander/"; - description = "GUI for controlling a Digital Camera through the IEEE1394 bus"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ viric ]; - platforms = with lib.platforms; linux; - mainProgram = "coriander"; - }; -} diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index db3f6e7f9a54e..ec15a47090fdb 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -24,7 +24,6 @@ , zip , dvdisasterSupport ? true, dvdisaster ? null -, thumbnailSupport ? true, libgnomeui ? null , udevSupport ? true, udev ? null , dbusSupport ? true, dbus ? null }: @@ -72,8 +71,7 @@ in stdenv.mkDerivation rec { ] ++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals udevSupport [ udev ] - ++ optionals dbusSupport [ dbus ] - ++ optionals thumbnailSupport [ libgnomeui ]; + ++ optionals dbusSupport [ dbus ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/memento/default.nix b/pkgs/applications/video/memento/default.nix index 0c993de2fcaba..1f6981215d39b 100644 --- a/pkgs/applications/video/memento/default.nix +++ b/pkgs/applications/video/memento/default.nix @@ -16,13 +16,13 @@ , makeWrapper}: stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; rev = "v${finalAttrs.version}"; - hash = "sha256-/lgjzR2KwlIUMHSz3afBQEy+8kdKAI37kqTuq3r3qMk="; + hash = "sha256-3WOtf7cgYxAMlNPSBmTzaQF1HN9mU61giLp2woBAidY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 34776679aa257..1f5d948362db6 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -10,13 +10,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.35"; + version = "0.36"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-LcO17zkGkXWqSjWPTA3cVwRnmSrhTlS3W4RhhYaKgY4="; + sha256 = "sha256-j8K9coa8kyA7AgRQaBXJJmeTpNtfDKkOGnAP9Up7biA="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 418d9adf8263b..82b557d449e17 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -48,8 +48,6 @@ , nlohmann_json , websocketpp , asio -, decklinkSupport ? false -, blackmagic-desktop-video , libdatachannel , libvpl , qrcodegencpp @@ -167,8 +165,6 @@ stdenv.mkDerivation (finalAttrs: { xorg.libX11 libvlc libGL - ] ++ optionals decklinkSupport [ - blackmagic-desktop-video ]; in '' # Remove libcef before patchelf, otherwise it will fail diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c43b823dd7f81..5f47c666078c4 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-RBsdYG73SoX+dB4sUq641SL0ETUFE+PVAmr/DaqMuLI="; + sha256 = "sha256-4BmTp/PrR01H9IrKNX9ZpK4kLaiNG/G9rTMf9dsoV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 3b457530fbf29..a720e672c783d 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Real-Time Appearance-Based 3D Mapping"; homepage = "https://introlab.github.io/rtabmap/"; license = licenses.bsd3; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 710ca4395e084..61c6684a2f823 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.06.02"; + version = "24.06.26"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-zqP3xGaNx6z3DdEyKZTauXGTY16dZPL/2+gKtgdx4Y8="; + hash = "sha256-9eQF3s4BAUK81/94z7cMkd2NWdNLVMraP08qsDmuAI8="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix index b80d1c3c447b8..2124813f417fd 100644 --- a/pkgs/applications/video/timelens/default.nix +++ b/pkgs/applications/video/timelens/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://timelens.blinry.org"; changelog = "https://github.com/timelens/timelens/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "timelens"; }; } diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index acb652e33cb77..ed68dbc376e93 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.18"; + version = "1.7.19"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + hash = "sha256-+tYv80y//C67F0QUjCkZYcahiHO4rZtlcr+33foN/M8="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 00f17d75d6e59..b52c91e4e1eda 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.30.2"; + version = "1.30.3"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-4v7Pt3WS68h+Un4QNATyQ/o/+8b8nVoNsy6VgwB9Brc="; + hash = "sha256-Cv76S2Ylsjzjc6rjCcRJyFjrIrm76I5pqDa1FI+Oq9s="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 609b0e97deb05..3b5f5669d7f7f 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.14.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-IseiGF+tQWv7Z2jlCINuWH2Gzcdow2qazvYVFBGyQPU="; + hash = "sha256-JaUCj9HY0MhHLkPTRd72NaGlBdPCPc+y2XjhVQ/3+NA="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3d096c3389f9d..a48eda041fefe 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -314,4 +314,18 @@ rec { tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + docker_27 = callPackage dockerGen rec { + version = "27.0.3"; + cliRev = "v${version}"; + cliHash = "sha256-fpjSnUq3T6WZO/FLeT377FWxwevbULob9dPiSBxZdHI="; + mobyRev = "v${version}"; + mobyHash = "sha256-v5uhFQPbBIpfnKtAkmbq4w+TbaG01tqTSWNBE3NvPKU="; + runcRev = "v1.1.13"; + runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; + containerdRev = "v1.7.18"; + containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + } diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index e5fe625cdf9f1..ea58577680776 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.82.4"; + version = "1.84.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-bM/K3fxkeDwsXKsgZaEkurgYdSHnOgIQ2oUKc5atvZk="; + hash = "sha256-6Les4qio+ad10b172Xw5bwU2OZiLOjZZhaoNW0MYFzk="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e5dde1e021c7f..63abcad60a5d6 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "open-vm-tools"; - version = "12.4.0"; + version = "12.4.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${finalAttrs.version}"; - hash = "sha256-RcjNY02aLOU4X6znfZ37+ICB19WYp+HxHRvvpfW3Ub8="; + hash = "sha256-VMnxWKGBgwnkP9eSVm///d6THzzWgUe5kNj/lGVBVlc="; }; sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index bdd585e9c8bc4..44d9caf260573 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,7 +1,7 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pipBuildHook, pypaBuildHook }: +{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pypaBuildHook }: buildPythonApplication rec { - version = "1.1.0"; + version = "1.2.0"; pname = "podman-compose"; pyproject = true; @@ -9,10 +9,9 @@ buildPythonApplication rec { repo = "podman-compose"; owner = "containers"; rev = "v${version}"; - sha256 = "sha256-uNgzdLrnDIABtt0L2pvsil14esRzl0XcWohgf7Oksr8="; + hash = "sha256-40RatexY/6eRfCodaiBeJpyt1sDUj2STSPL0gBECdRs="; }; - build-system = [ setuptools ]; diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix index 244e438626e0a..cb3c79f36aa9c 100644 --- a/pkgs/applications/virtualization/quickgui/default.nix +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -5,7 +5,7 @@ , dpkg , wrapGAppsHook3 , quickemu -, gnome +, zenity }: stdenvNoCC.mkDerivation rec { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ quickemu - gnome.zenity + zenity ]; strictDeps = true; @@ -42,7 +42,7 @@ stdenvNoCC.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]} + --prefix PATH : ${lib.makeBinPath [ quickemu zenity ]} ) ''; diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index f27f58fda4876..1cac1d4f16c65 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -70,11 +70,19 @@ in # Whether to compile with SUID support enableSuid ? false, starterSuidPath ? null, - # newuidmapPath and newgidmapPath are to support --fakeroot - # where those SUID-ed executables are unavailable from the FHS system PATH. + # Extra system-wide /**/bin paths to prefix, + # useful to specify directories containing binaries with SUID bit set. + # The paths take higher precedence over the FHS system PATH specified + # inside the upstream source code. + # Include "/run/wrappers/bin" by default for the convenience of NixOS users. + systemBinPaths ? [ "/run/wrappers/bin" ], # Path to SUID-ed newuidmap executable + # Deprecated in favour of systemBinPaths + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off newuidmapPath ? null, # Path to SUID-ed newgidmap executable + # Deprecated in favour of systemBinPaths + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off newgidmapPath ? null, # External LOCALSTATEDIR externalLocalStateDir ? null, @@ -99,18 +107,30 @@ in vendorHash ? _defaultGoVendorArgs.vendorHash, deleteVendor ? _defaultGoVendorArgs.deleteVendor, proxyVendor ? _defaultGoVendorArgs.proxyVendor, -}: +}@args: let + # Backward compatibility for privileged-un-utils. + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off. privileged-un-utils = if ((newuidmapPath == null) && (newgidmapPath == null)) then null else - (runCommandLocal "privileged-un-utils" { } '' - mkdir -p "$out/bin" - ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" - ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" - ''); + lib.warn + "${pname}: arguments newuidmapPath and newgidmapPath is deprecated in favour of systemBinPaths." + ( + runCommandLocal "privileged-un-utils" { } '' + mkdir -p "$out/bin" + ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" + ln -s ${lib.escapeShellArg newgidmapPath} "$out/bin/newgidmap" + '' + ); + + # Backward compatibility for privileged-un-utils. + # TODO(@ShamrockLee): Remove after Nixpkgs 24.05 branch-off. + systemBinPaths = + lib.optional (privileged-un-utils != null) (lib.makeBinPath [ privileged-un-utils ]) + ++ args.systemBinPaths or [ "/run/wrappers/bin" ]; concatMapStringAttrsSep = sep: f: attrs: @@ -196,8 +216,9 @@ in # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - # Packages to prefix to the Apptainer/Singularity container runtime default PATH - # Use overrideAttrs to override + # Packages to provide fallback bin paths + # to the Apptainer/Singularity container runtime default PATHs. + # Override with `<pkg>.overrideAttrs`. defaultPathInputs = [ bash coreutils @@ -206,7 +227,6 @@ in fuse2fs # Mount ext3 filesystems go mount # mount - privileged-un-utils squashfsTools # mksquashfs unsquashfs # Make / unpack squashfs image squashfuse # squashfuse_ll squashfuse # Mount (without unpacking) a squashfs image without privileges ] ++ lib.optional enableNvidiaContainerCli nvidia-docker; @@ -228,7 +248,7 @@ in lib.concatStringsSep " " [ "--replace-fail" (addShellDoubleQuotes (lib.escapeShellArg originalDefaultPath)) - (addShellDoubleQuotes ''$inputsDefaultPath''${inputsDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}'') + (addShellDoubleQuotes ''$systemDefaultPath''${systemDefaultPath:+:}${lib.escapeShellArg originalDefaultPath}''${inputsDefaultPath:+:}$inputsDefaultPath'') ] ) originalDefaultPaths } @@ -267,8 +287,11 @@ in postFixup = '' substituteInPlace "$out/bin/run-singularity" \ --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" + # Respect PATH from the environment/the user. + # Fallback to bin paths provided by Nixpkgs packages. wrapProgram "$out/bin/${projectName}" \ - --prefix PATH : "$inputsDefaultPath" + --suffix PATH : "$systemDefaultPath" \ + --suffix PATH : "$inputsDefaultPath" # Make changes in the config file ${lib.optionalString forceNvcCli '' substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ @@ -326,6 +349,7 @@ in }).overrideAttrs ( finalAttrs: prevAttrs: { + systemDefaultPath = lib.concatStringsSep ":" systemBinPaths; inputsDefaultPath = lib.makeBinPath finalAttrs.defaultPathInputs; passthru = prevAttrs.passthru or { } // { inherit sourceFilesWithDefaultPaths; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 281f451fddbd2..228c2ed6cb9f8 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook3, gtk-vnc , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, gst_all_1, libosinfo, gnome, gtksourceview4, docutils, cpio +, gsettings-desktop-schemas, gst_all_1, libosinfo, adwaita-icon-theme, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch , desktopToDarwinBundle, stdenv , spiceSupport ? true, spice-gtk ? null @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi + libvirt-glib vte dconf gtk-vnc adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 ] ++ lib.optional spiceSupport spice-gtk; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index dd9b99f7f9bc9..244d1237152e5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -22,9 +22,6 @@ , extraConfigureFlags ? "" }: -# See https://github.com/cyberus-technology/virtualbox-kvm/issues/12 -assert enableKvm -> !enableHardening; - # The web services use Java infrastructure. assert enableWebService -> javaBindings; @@ -35,8 +32,8 @@ let virtualboxVersion = "7.0.18"; virtualboxSha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"; - kvmPatchVersion = "20240515"; - kvmPatchHash = "sha256-Kh/tlPScdf7CbEEpL54iqMpeUIdmnJL2r/mxnlEzLd0="; + kvmPatchVersion = "20240617"; + kvmPatchHash = "sha256-bOcM9xA1SXB1uTwljpw2vevVeSdHa3omCRon/8DoAUk="; # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix index 6a1dda5842072..5810070d2ff43 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/plugins.nix @@ -28,7 +28,7 @@ in brightness.propagatedBuildInputs = [ ]; caffeine.propagatedBuildInputs = [ pkgs.xdg-utils pkgs.xdotool pkgs.xorg.xprop pkgs.libnotify ]; cmus.propagatedBuildInputs = [ pkgs.cmus ]; - cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome.gnome-system-monitor ]; + cpu.propagatedBuildInputs = [ py.psutil pkgs.gnome-system-monitor ]; cpu2.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; cpu3.propagatedBuildInputs = [ py.psutil pkgs.lm_sensors ]; currency.propagatedBuildInputs = [ py.requests ]; @@ -85,8 +85,8 @@ in # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. layout_xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; libvirtvms.propagatedBuildInputs = [ py.libvirt ]; - load.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; - memory.propagatedBuildInputs = [ pkgs.gnome.gnome-system-monitor ]; + load.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; + memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; messagereceiver = { }; mocp.propagatedBuildInputs = [ pkgs.moc ]; mpd.propagatedBuildInputs = [ pkgs.mpc-cli ]; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index a51f3838aa3aa..6bbbf6100949f 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "0-unstable-2024-05-17"; + version = "0-unstable-2024-06-13"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "5be8f60326181b22e111f02918ae5778cf1a89b0"; - hash = "sha256-dHY0bfVfRpiBY5rPnhmu3aHXx1l9jQhXBtcBbej2JFk="; + rev = "2e88df729fb4961fa81dc9848291fe73c5657c03"; + hash = "sha256-a5c48U+FaHns52/wQQxYQMSXjjqGzaMh1gs3HTOM7Ys="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index a5b0398d44425..99c6892ba3da1 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "sommelier"; - version = "125.0"; + version = "126.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "4445ac169a9e043fd260a835384aaa49c457c358"; + passthru.rev = "fd3798efe23f2edbc48f86f2fbd82ba5059fd875"; stripRoot = false; - sha256 = "1PofODGZDknZpzXI1d3JcoNYz3IGfw32nm+SmUpeqb8="; + sha256 = "BmWZnMcK7IGaEAkVPulyb3hngsmuI0D1YtQEbqMjV5c="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 0d44a5ab23e96..638e29c3bc3b6 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -74,7 +74,7 @@ rec { targetPkgs = pkgs: with pkgs; [ gtk3 bashInteractive - gnome.zenity + zenity xorg.xrandr which perl diff --git a/pkgs/build-support/dev-shell-tools/README.md b/pkgs/build-support/dev-shell-tools/README.md new file mode 100644 index 0000000000000..d6d9a8c8ad0df --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/README.md @@ -0,0 +1,13 @@ + +# `devShellTools` + +This directory implements the `pkgs.devShellTools` library. + +# Contributing to `devShellTools` + +- Documentation should be contributed to the Nixpkgs manual, not here. + +- Tests are available in the `tests` directory. + You may run them with `nix-build -A tests.devShellTools`. + +- See [../../README.md](../../README.md) for more information on contributing to Nixpkgs. diff --git a/pkgs/build-support/dev-shell-tools/default.nix b/pkgs/build-support/dev-shell-tools/default.nix new file mode 100644 index 0000000000000..cd5fa5f5937ef --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/default.nix @@ -0,0 +1,16 @@ +{ lib }: +let + inherit (builtins) typeOf; +in +rec { + # This function closely mirrors what this Nix code does: + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 + # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 + valueToString = value: + # We can't just use `toString` on all derivation attributes because that + # would not put path literals in the closure. So we explicitly copy + # those into the store here + if typeOf value == "path" then "${value}" + else if typeOf value == "list" then toString (map valueToString value) + else toString value; +} diff --git a/pkgs/build-support/dev-shell-tools/tests/default.nix b/pkgs/build-support/dev-shell-tools/tests/default.nix new file mode 100644 index 0000000000000..bfedc04409a98 --- /dev/null +++ b/pkgs/build-support/dev-shell-tools/tests/default.nix @@ -0,0 +1,45 @@ +{ + devShellTools, + emptyFile, + lib, + stdenv, + hello, +}: +let + inherit (lib) escapeShellArg; +in +{ + # nix-build -A tests.devShellTools.valueToString + valueToString = + let inherit (devShellTools) valueToString; in + + stdenv.mkDerivation { + name = "devShellTools-valueToString-built-tests"; + + # Test inputs + inherit emptyFile hello; + one = 1; + boolTrue = true; + boolFalse = false; + foo = "foo"; + list = [ 1 2 3 ]; + pathDefaultNix = ./default.nix; + packages = [ hello emptyFile ]; + # TODO: nested lists + + buildCommand = '' + touch $out + ( set -x + [[ "$one" = ${escapeShellArg (valueToString 1)} ]] + [[ "$boolTrue" = ${escapeShellArg (valueToString true)} ]] + [[ "$boolFalse" = ${escapeShellArg (valueToString false)} ]] + [[ "$foo" = ${escapeShellArg (valueToString "foo")} ]] + [[ "$hello" = ${escapeShellArg (valueToString hello)} ]] + [[ "$list" = ${escapeShellArg (valueToString [ 1 2 3 ])} ]] + [[ "$packages" = ${escapeShellArg (valueToString [ hello emptyFile ])} ]] + [[ "$pathDefaultNix" = ${escapeShellArg (valueToString ./default.nix)} ]] + [[ "$emptyFile" = ${escapeShellArg (valueToString emptyFile)} ]] + ) >log 2>&1 || { cat log; exit 1; } + ''; + }; +} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 1d1989d27fbb2..ea461ccffa078 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -4,6 +4,7 @@ , callPackage , closureInfo , coreutils +, devShellTools , e2fsprogs , proot , fakeNss @@ -49,6 +50,10 @@ let toList ; + inherit (devShellTools) + valueToString + ; + mkDbExtraCommand = contents: let contentsList = if builtins.isList contents then contents else [ contents ]; @@ -1141,7 +1146,7 @@ rec { # A binary that calls the command to build the derivation builder = writeShellScriptBin "buildDerivation" '' - exec ${lib.escapeShellArg (stringValue drv.drvAttrs.builder)} ${lib.escapeShellArgs (map stringValue drv.drvAttrs.args)} + exec ${lib.escapeShellArg (valueToString drv.drvAttrs.builder)} ${lib.escapeShellArgs (map valueToString drv.drvAttrs.args)} ''; staticPath = "${dirOf shell}:${lib.makeBinPath [ builder ]}"; @@ -1173,20 +1178,9 @@ rec { # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465 sandboxBuildDir = "/build"; - # This function closely mirrors what this Nix code does: - # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102 - # https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036 - stringValue = value: - # We can't just use `toString` on all derivation attributes because that - # would not put path literals in the closure. So we explicitly copy - # those into the store here - if builtins.typeOf value == "path" then "${value}" - else if builtins.typeOf value == "list" then toString (map stringValue value) - else toString value; - # https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004 drvEnv = lib.mapAttrs' (name: value: - let str = stringValue value; + let str = valueToString value; in if lib.elem name (drv.drvAttrs.passAsFile or []) then lib.nameValuePair "${name}Path" (writeText "pass-as-text-${name}" str) else lib.nameValuePair name str diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index a3ca6685147d3..97b3661bb2d46 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -14,6 +14,7 @@ , includes ? [] , revert ? false , postFetch ? "" +, nativeBuildInputs ? [] , ... }@args: let @@ -29,6 +30,7 @@ in lib.throwIfNot (excludes == [] || includes == []) "fetchpatch: cannot use excludes and includes simultaneously" fetchurl ({ + nativeBuildInputs = [ patchutils ] ++ nativeBuildInputs; postFetch = '' tmpfile="$TMPDIR/patch" @@ -48,12 +50,12 @@ fetchurl ({ set -e mv "$tmpfile" "$out" - "${patchutils}/bin/lsdiff" \ + lsdiff \ ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \ "$out" \ | sort -u | sed -e 's/[*?]/\\&/g' \ | xargs -I{} \ - "${patchutils}/bin/filterdiff" \ + filterdiff \ --include={} \ --strip=${toString stripLen} \ ${lib.optionalString (extraPrefix != null) '' @@ -70,7 +72,7 @@ fetchurl ({ exit 1 fi - ${patchutils}/bin/filterdiff \ + filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ ${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \ @@ -84,10 +86,10 @@ fetchurl ({ exit 1 fi '' + lib.optionalString revert '' - ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" + interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" '' + postFetch; } // builtins.removeAttrs args [ "relative" "stripLen" "decode" "extraPrefix" "excludes" "includes" "revert" - "postFetch" + "postFetch" "nativeBuildInputs" ]) diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index 0a27f1bc70e7a..b7352fff7f925 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -7,7 +7,7 @@ in { simple = testers.invalidateFetcherByDrvHash fetchpatch { url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; - sha256 = if isFetchpatch2 then "sha256-01BrkHLye4KOdqCw3tv7AJzIF6578pl2fl270TJFTmw=" else "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; + sha256 = if isFetchpatch2 then "sha256-w4yU0wt64d0WkuBQPeGf8vn5TH6qSBJvNIgka9QK+/Q=" else "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; }; relative = testers.invalidateFetcherByDrvHash fetchpatch { diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 9c27a142f4b65..5f8d1eee8ce4d 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -56,7 +56,7 @@ in , prepend ? [] # Whether to wrap the initramfs in a u-boot image. -, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target == "uImage" +, makeUInitrd ? stdenvNoCC.hostPlatform.linux-kernel.target or "dummy" == "uImage" # If generating a u-boot image, the architecture to use. The default # guess may not align with u-boot's nomenclature correctly, so it can @@ -75,11 +75,9 @@ let toValidStoreName = x: with builtins; lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); -in stdenvNoCC.mkDerivation rec { +in stdenvNoCC.mkDerivation (rec { inherit name makeUInitrd extension uInitrdArch prepend; - ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression; - builder = ./make-initrd.sh; nativeBuildInputs = [ perl libarchive ] @@ -110,4 +108,6 @@ in stdenvNoCC.mkDerivation rec { contents (lib.range 0 (lib.length contents - 1)); pathsFromGraph = ./paths-from-graph.pl; -} +} // lib.optionalAttrs makeUInitrd { + uInitrdCompression = uInitrdCompression; +}) diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index d86fc90c6c7d1..a001f80b113ce 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -142,7 +142,7 @@ meta = with lib; { description = "Prefetch dependencies from npm (for use with `fetchNpmDeps`)"; mainProgram = "prefetch-npm-deps"; - maintainers = with maintainers; [ lilyinstarlight winter ]; + maintainers = with maintainers; [ winter ]; license = licenses.mit; }; }; diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 7484b3ad0290e..3af13fe70a7de 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,5 +1,5 @@ { lib, stdenv -, mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI +, mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI, rustc }: { crateName, @@ -27,6 +27,10 @@ # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro" + ++ lib.optional (stdenv.hostPlatform.linker == "lld") # Needed when building for targets that use lld. e.g. 'wasm32-unknown-unknown' + "-C linker=${rustc.llvmPackages.lld}/bin/lld" + ++ lib.optional (stdenv.hasCC && stdenv.hostPlatform.linker != "lld") + "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ; rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; @@ -39,10 +43,7 @@ ++ (map (x: "--crate-type ${x}") crateType) ); - binRustcOpts = lib.concatStringsSep " " ( - [ "-C linker=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ] ++ - baseRustcOpts - ); + binRustcOpts = lib.concatStringsSep " " baseRustcOpts; build_bin = if buildTests then "build_bin_test" else "build_bin"; in '' diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index ab872bac854f8..fd61d73deb722 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -14,6 +14,7 @@ , crateLicenseFile , crateLinks , crateName +, crateType , crateReadme , crateRenames , crateRepository @@ -209,6 +210,11 @@ in '' EXTRA_LINK_LIBS=$(sed -n "s/^cargo::\{0,1\}rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_LINK_SEARCH=$(sed -n "s/^cargo::\{0,1\}rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + ${lib.optionalString (lib.elem "cdylib" crateType) '' + CRATE_TYPE_IS_CDYLIB="true" + EXTRA_CDYLIB_LINK_ARGS=$(sed -n "s/^cargo::\{0,1\}rustc-cdylib-link-arg=\(.*\)/-C link-arg=\1/p" target/build/${crateName}.opt | tr '\n' ' ') +''} + # We want to read part of every line that has cargo:rustc-env= prefix and # export it as environment variables. This turns out tricky if the lines # have spaces: we can't wrap the command in double quotes as that captures diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index dfe28cc334b5e..841e8e86cbfb1 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -16,6 +16,16 @@ }: let + # Returns a true if the builder's rustc was built with support for the target. + targetAlreadyIncluded = lib.elem stdenv.hostPlatform.rust.rustcTarget + (lib.splitString "," (lib.removePrefix "--target=" ( + lib.elemAt (lib.filter (f: lib.hasPrefix "--target=" f) pkgsBuildBuild.rustc.unwrapped.configureFlags) 0) + )); + + # If the build's rustc was built with support for the target then reuse it. (Avoids uneeded compilation for targets like `wasm32-unknown-unknown`) + rustc' = if targetAlreadyIncluded then pkgsBuildBuild.rustc else rustc; + cargo' = if targetAlreadyIncluded then pkgsBuildBuild.cargo else cargo; + # Create rustc arguments to link against the given list of dependencies # and renames. # @@ -77,6 +87,7 @@ let buildCrate = import ./build-crate.nix { inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI; + rustc = rustc'; }; installCrate = import ./install-crate.nix { inherit stdenv; }; @@ -274,7 +285,8 @@ crate_: lib.makeOverridable name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; - nativeBuildInputs = [ rust stdenv.cc cargo jq ] + nativeBuildInputs = [ rustc' cargo' jq ] + ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; @@ -345,7 +357,7 @@ crate_: lib.makeOverridable configurePhase = configureCrate { - inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription + inherit crateName crateType buildDependencies completeDeps completeBuildDeps crateDescription crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks extraLinkFlags extraRustcOptsForBuildRs crateLicense crateLicenseFile crateReadme crateRepository crateRustVersion @@ -380,7 +392,7 @@ crate_: lib.makeOverridable ) ) { - rust = rustc; + rust = rustc'; release = crate_.release or true; verbose = crate_.verbose or true; extraRustcOpts = [ ]; diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 0181ae432c85b..36ddc9ac23c4f 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -114,6 +114,12 @@ setup_link_paths() { tr '\n' ' ' < target/link > target/link_ LINK=$(cat target/link_) fi + + # Add "rustc-cdylib-link-arg" as linker arguments + # https://doc.rust-lang.org/cargo/reference/build-scripts.html#rustc-cdylib-link-arg + if [[ -n "$CRATE_TYPE_IS_CDYLIB" ]]; then + EXTRA_BUILD+=" $EXTRA_CDYLIB_LINK_ARGS" + fi } search_for_bin_path() { diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index d020031a92f93..dd135af919654 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -8,6 +8,7 @@ , stdenv , symlinkJoin , writeTextFile +, pkgsCross }: let @@ -120,7 +121,10 @@ let `name` is used as part of the derivation name that performs the checking. - `crateArgs` is passed to `mkHostCrate` to build the crate with `buildRustCrate`. + `mkCrate` can be used to override the `mkCrate` call/implementation to use to + override the `buildRustCrate`, useful for cross compilation. Uses `mkHostCrate` by default. + + `crateArgs` is passed to `mkCrate` to build the crate with `buildRustCrate` `expectedFiles` contains a list of expected file paths in the output. E.g. `[ "./bin/my_binary" ]`. @@ -129,13 +133,13 @@ let output is used but e.g. `output = "lib";` will cause the lib output to be checked instead. You do not need to specify any directories. */ - assertOutputs = { name, crateArgs, expectedFiles, output? null }: + assertOutputs = { name, mkCrate ? mkHostCrate, crateArgs, expectedFiles, output? null, }: assert (builtins.isString name); assert (builtins.isAttrs crateArgs); assert (builtins.isList expectedFiles); let - crate = mkHostCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]); + crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]); crateOutput = if output == null then crate else crate."${output}"; expectedFilesFile = writeTextFile { name = "expected-files-${name}"; @@ -155,7 +159,7 @@ let '' # sed out the hash because it differs per platform + '' - | sed -E -e 's/-[0-9a-fA-F]{10}\.rlib/-HASH.rlib/g' \ + | sed 's/-${crate.metadata}//g' \ > "$actualFiles" diff -q ${expectedFilesFile} "$actualFiles" > /dev/null || { echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2 @@ -651,7 +655,7 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-HASH.rlib" + "./lib/libtest_lib.rlib" "./lib/link" ]; }; @@ -668,7 +672,24 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-HASH.rlib" + "./lib/libtest_lib.rlib" + "./lib/link" + ]; + }; + + crateLibOutputsWasm32 = assertOutputs { + name = "wasm32-crate-lib"; + output = "lib"; + mkCrate = mkCrate pkgsCross.wasm32-unknown-none.buildRustCrate; + crateArgs = { + libName = "test_lib"; + type = [ "cdylib" ]; + libPath = "src/lib.rs"; + src = mkLib "src/lib.rs"; + }; + expectedFiles = [ + "./nix-support/propagated-build-inputs" + "./lib/test_lib.wasm" "./lib/link" ]; }; diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 93fac09c07ba5..bceac1b0c9590 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -485,7 +485,7 @@ rec { # returns an executable # # Example: - # writeJS "example" { libraries = [ pkgs.nodePackages.uglify-js ]; } '' + # writeJS "example" { libraries = [ pkgs.uglify-js ]; } '' # var UglifyJS = require("uglify-js"); # var code = "function add(first, second) { return first + second; }"; # var result = UglifyJS.minify(code); diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index 0be042d174f23..c0c9ee4a7fa82 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -15,7 +15,7 @@ libpulseaudio, libpng, imagemagick, - gnome, + zenity, makeWrapper, imgui, stormlib, @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 libpulseaudio libpng - gnome.zenity + zenity imgui' stormlib' libzip @@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ''; fixupPhase = '' - wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} + wrapProgram $out/2s2h/2s2h.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]} ''; desktopItems = [ diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix index 371aae75fab3d..7372545eb56dd 100644 --- a/pkgs/by-name/_4/_4d-minesweeper/package.nix +++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { description = "4D Minesweeper game written in Godot"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ nayala ]; + maintainers = with maintainers; []; mainProgram = "4d-minesweeper"; }; } diff --git a/pkgs/desktops/gnome/apps/accerciser/default.nix b/pkgs/by-name/ac/accerciser/package.nix index b8f5d153467e9..7493c6a0bfa4d 100644 --- a/pkgs/desktops/gnome/apps/accerciser/default.nix +++ b/pkgs/by-name/ac/accerciser/package.nix @@ -62,7 +62,6 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = "accerciser"; - attrPath = "gnome.accerciser"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix index 324d439d75897..ac39b2f703596 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "adwaita-icon-theme"; - attrPath = "gnome.adwaita-icon-theme"; }; }; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 5645e92aa1bac..68364f7bf529f 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-02-23"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "61eb388760d130476415a51e19f94b199a1088fe"; - hash = "sha256-68EX5rnOlBHXZnMlXjQk+ZXFIwR5ZFc1Wyg8EzCKaUg="; + rev = "3799e7893d6b5221706f64a00a6d139fb9717380"; + hash = "sha256-TyoLVZpKQ68/yjiUsJaXW1z0qr8krIAxRuFG7RtsToI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index 388faf9d41cc5..d12c701d355d3 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -18,12 +18,12 @@ let in buildNpmPackage rec { pname = "antimatter-dimensions"; - version = "0-unstable-2024-05-11"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "b3a254af60207a03d04473bb81726e921f5b2c61"; - hash = "sha256-+G9mNilt5Ewja5P+Bt312EcCJknMu7FOMn5b4FseAyQ="; + rev = "aeaa7a358f605073172ec9eaa28ff6544edca5a5"; + hash = "sha256-rXFXoSOtYeLIBQzJ/J+FMSp9CKHOCzq3HxQMd2Bpm3E="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index 57de40bcf25f1..c524066c857f7 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -4,14 +4,14 @@ , kdePackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "application-title-bar"; version = "0.6.3"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-r15wZCioWrTr5mA0WARFd4j8zwWIWU4wEv899RSURa4="; }; @@ -22,15 +22,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/plasma/plasmoids/com.github.antroids.application-title-bar - cp -r $src/package/* $out/share/plasma/plasmoids/com.github.antroids.application-title-bar + cp -r package/* $out/share/plasma/plasmoids/com.github.antroids.application-title-bar runHook postInstall ''; - meta = with lib; { + meta = { description = "KDE Plasma6 widget with window controls"; homepage = "https://github.com/antroids/application-title-bar"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ HeitorAugustoLN ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 84683435f4eef..6367a0ea83e5e 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.48.2-51225"; + version = "1.49.0-51346"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-8VukOTt94nstaGRuTQg32HNPEaGBQtJGqRYgKLSD/TY="; + hash = "sha256-XrFDYzRUGCSyM8E+zHK/OZMKWYI9kCxUQ2TI98htPWk="; }; nativeBuildInputs = [ undmg ]; @@ -29,6 +29,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + dontFixup = true; + passthru.updateScript = lib.getExe (writeShellApplication { name = "arc-browser-update-script"; runtimeInputs = [ curl common-updater-scripts ]; diff --git a/pkgs/by-name/as/aseprite/package.nix b/pkgs/by-name/as/aseprite/package.nix index 13cd6e6bb0ddb..6aae1d237f643 100644 --- a/pkgs/by-name/as/aseprite/package.nix +++ b/pkgs/by-name/as/aseprite/package.nix @@ -164,7 +164,6 @@ clangStdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ orivej - vigress8 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix new file mode 100644 index 0000000000000..846ce5ef176ab --- /dev/null +++ b/pkgs/by-name/as/asfa/package.nix @@ -0,0 +1,72 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, + help2man, + openssl, + pkg-config, + installShellFiles, +}: +let + version = "0.10.0"; + src = fetchFromGitHub { + owner = "obreitwi"; + repo = "asfa"; + rev = "v${version}"; + hash = "sha256-MnhnwtZmPFhOuiqNiaxJnPu88JOdlpvyVy0YGphblBc="; + }; +in +rustPlatform.buildRustPackage { + pname = "asfa"; + inherit version src; + + cargoHash = "sha256-/bRBP/NzcNOXl/nANeOYouUAo3NNbtbV9fxIJrNajYQ="; + + outputs = [ + "out" + "man" + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + + nativeBuildInputs = [ + help2man + installShellFiles + pkg-config + ]; + + # checks disabled because tests need to be run against (docker-based) ephemeral ssh-server + doCheck = false; + + postInstall = '' + mkdir -p "man/man1" + help2man -o "man/man1/asfa.1" "$out/bin/asfa" + + # Generate info about all subcommands except for 'help' (which leads to error) + "$out/bin/asfa" --help | awk 'enabled && $1 != "help" { print $1 } /^SUBCOMMANDS:$/ { enabled=1 }' \ + | while read -r cmd; do + help2man \ + "--version-string=${version}" \ + -o "man/man1/asfa-$cmd.1" \ + "$out/bin/asfa $cmd" + done + + installManPage man/man1/*.1 + ''; + + meta = { + description = "Avoid sending file attachments by uploading them via SSH to a remote site and sharing a publicly-accessible URL with non-guessable (hash-based) prefix instead"; + homepage = "https://github.com/obreitwi/asfa"; + changelog = "https://github.com/obreitwi/asfa/blob/${src.rev}/CHANGELOG.md"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ obreitwi ]; + mainProgram = "asfa"; + }; +} diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index e5ffcc27b2ce1..644ef2e284ca0 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-QW3ZwALvfSTcvXuH/ploqUD1UJ5fGySIAc3N/TMlB4g="; + hash = "sha256-kNPmtaUb5rMbdTlNKD3PrInuxGQt/JamMDx8BwBxVd8="; }; - cargoHash = "sha256-MUdHDP+1KQBXy2itOhW6pDuOTwIwXHy4oDfifDRdM94="; + cargoHash = "sha256-iV2GXH7opNIyWsgi0EnRIXDhJd3s66qFhnZWawBPb6g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 9142c0dad9d13..a4223aa3a096f 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -4,10 +4,10 @@ , lib , makeDesktopItem , makeWrapper -, stdenv +, stdenvNoCC -, gamemodeSupport ? stdenv.isLinux -, textToSpeechSupport ? stdenv.isLinux +, gamemodeSupport ? stdenvNoCC.isLinux +, textToSpeechSupport ? stdenvNoCC.isLinux , additionalLibs ? [ ] , # dependencies @@ -19,7 +19,7 @@ , xorg }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; version = "3.4.36.9"; diff --git a/pkgs/by-name/ba/backlight-auto/package.nix b/pkgs/by-name/ba/backlight-auto/package.nix index 26869b5a20dd4..9fa2d1245d10c 100644 --- a/pkgs/by-name/ba/backlight-auto/package.nix +++ b/pkgs/by-name/ba/backlight-auto/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "backlight-auto"; homepage = "https://len.falken.directory/backlight-auto.html"; license = licenses.mit; - maintainers = [ maintainers.lf- ]; + maintainers = [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix new file mode 100644 index 0000000000000..669e4ae1719bb --- /dev/null +++ b/pkgs/by-name/ba/bant/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + buildBazelPackage, + fetchFromGitHub, + bazel_6, + jdk, + git, +}: + +let + system = stdenv.hostPlatform.system; + registry = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel-central-registry"; + rev = "1c729c2775715fd98f0f948a512eb173213250da"; + hash = "sha256-1iaDDM8/v8KCOUjPgLUtZVta7rMzwlIK//cCoLUrb/s="; + }; +in buildBazelPackage rec { + pname = "bant"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "bant"; + rev = "v${version}"; + hash = "sha256-3xGAznR/IHQHY1ISqmU8NxI90Pl57cdYeRDeLVh9L08="; + }; + + bazelFlags = ["--registry" "file://${registry}"]; + + postPatch = '' + patchShebangs scripts/create-workspace-status.sh + ''; + + fetchAttrs = { + sha256 = { + aarch64-linux = "sha256-jtItWNfl+ebQqU8VWmvLsgNYNARGxN8+CTBz2nZcBEY="; + x86_64-linux = "sha256-ACJqybpHoMSg2ApGWkIyhdAQjIhb8gxUdo8SuWJvTNE="; + }.${system} or (throw "No hash for system: ${system}"); + }; + + nativeBuildInputs = [ + jdk + git + ]; + bazel = bazel_6; + + bazelBuildFlags = [ "-c opt" ]; + bazelTestTargets = [ "//..." ]; + bazelTargets = [ "//bant:bant" ]; + + buildAttrs = { + installPhase = '' + install -D --strip bazel-bin/bant/bant "$out/bin/bant" + ''; + }; + + meta = with lib; { + description = "Bazel/Build Analysis and Navigation Tool"; + homepage = "http://bant.build/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hzeller lromor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/by-name/ba/baobab/package.nix index 3978661baabb8..3978661baabb8 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/by-name/ba/baobab/package.nix diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index d591250ba2eb4..d300a1edf649d 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -1,19 +1,23 @@ { lib, - buildNpmPackage, fetchFromGitHub, runCommand, jq, + buildNpmPackage, + python3, + stdenvNoCC, + testers, + basedpyright, }: let - version = "1.12.6"; + version = "1.13.1"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-1F3T+BGamFJEDAIMz684oIn4xEDbNadEh8TTG5l8fPo="; + hash = "sha256-dIIYHVsDSNwhedWlPnLCvB5aGgVukGLs5K84WHqQyVM="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -43,7 +47,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-8nXW5Z5xTr8EXxyBylxCr7C88zmRxppe8EaspFy7b6o="; + npmDepsHash = "sha256-OZHCAJd/O6u1LhkJZ/TK9L8s4bcXMMNVlKF3If+Ms1A="; dontNpmBuild = true; # FIXME: Remove this flag when TypeScript 5.5 is released npmFlags = [ "--legacy-peer-deps" ]; @@ -53,16 +57,49 @@ let runHook postInstall ''; }; + + docify = python3.pkgs.buildPythonApplication { + pname = "docify"; + version = "unstable"; + format = "pyproject"; + src = fetchFromGitHub { + owner = "AThePeanut4"; + repo = "docify"; + rev = "7380a6faa6d1e8a3dc790a00254e6d77f84cbd91"; + hash = "sha256-BPR1rc/JzdBweiWmdHxgardDDrJZVWkUIF3ZEmEYf/A="; + }; + buildInputs = [ python3.pkgs.setuptools ]; + propagatedBuildInputs = [ + python3.pkgs.libcst + python3.pkgs.tqdm + ]; + }; + + docstubs = stdenvNoCC.mkDerivation { + name = "docstubs"; + inherit src; + buildInputs = [ docify ]; + + installPhase = '' + runHook preInstall + cp -r packages/pyright-internal/typeshed-fallback docstubs + ${docify}/bin/docify docstubs/stdlib --builtins-only --in-place + cp -rv docstubs "$out" + runHook postInstall + ''; + }; in buildNpmPackage rec { pname = "basedpyright"; inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-ZFuCY2gveimFK5Hztj6k6PkeTpbR7XiyQyS5wPaNNts="; + npmDepsHash = "sha256-wjwF1OlR9ohrl8gWW7ctVpeCq2Fu2m1XdHOEkXt7zjA="; postPatch = '' chmod +w ../../ + mkdir ../../docstubs + ln -s ${docstubs}/stubs ../../docstubs ln -s ${pyright-root}/node_modules ../../node_modules chmod +w ../pyright-internal ln -s ${pyright-internal}/node_modules ../pyright-internal/node_modules @@ -75,7 +112,10 @@ buildNpmPackage rec { dontNpmBuild = true; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = basedpyright; }; + }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases/tag/${version}"; diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 5476fc55f662d..9e4132bc0b460 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -75,6 +75,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sharkdp/bat/raw/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; mainProgram = "bat"; - maintainers = with maintainers; [ dywedir lilyball zowoq SuperSandro2000 ]; + maintainers = with maintainers; [ dywedir zowoq SuperSandro2000 ]; }; } diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix index b23a0e4307453..b3f7a7b7adaa7 100644 --- a/pkgs/by-name/bi/bilibili/package.nix +++ b/pkgs/by-name/bi/bilibili/package.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.13.6-2"; + version = "1.14.0-1"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-SVN3iw3o3QGLY0XWd48+kpNPYoK5V8oPOA10VyDgDMo="; + hash = "sha256-4+DGL/DNR3wLFUff17OquAM6dOkcsXFNeCqA7ITtCaI="; }; unpackPhase = '' diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 14a076c96078c..0fd2e1dae4ef0 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -6,27 +6,29 @@ , python3 , darwin , nixosTests +, xcbuild }: buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.6.0"; + version = "2024.6.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE="; + hash = "sha256-LKeJKA4/Vd80y48RdZTUh10bY38AoQ5G5oK6S77fSJI="; }; nodejs = nodejs_20; - npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8="; + npmDepsHash = "sha256-rwzyKaCW3LAOqw6BEu8DLS0Ad5hB6cH1OnjWzbSEgVI="; nativeBuildInputs = [ python3 ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools + xcbuild.xcrun ]; makeCacheWritable = true; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index ca6c93cac7b57..60e212bf475a1 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -6,7 +6,7 @@ , electron_29 , fetchFromGitHub , glib -, gnome +, gnome-keyring , gtk3 , jq , libsecret @@ -127,7 +127,7 @@ in buildNpmPackage rec { nativeCheckInputs = [ dbus - (gnome.gnome-keyring.override { useWrappedDaemon = false; }) + (gnome-keyring.override { useWrappedDaemon = false; }) ]; checkFlags = [ diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix new file mode 100644 index 0000000000000..6cc7e97c7c8b1 --- /dev/null +++ b/pkgs/by-name/bl/blastem/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchhg, + pkg-config, + makeBinaryWrapper, + SDL2, + glew, + gtk3, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "blastem"; + version = "0.6.2-unstable-2024-03-31"; + + src = fetchhg { + url = "https://www.retrodev.com/repos/blastem"; + rev = "48ab1e3e5df5"; + hash = "sha256-UZl5fIE7LJqxwS8kFJ3xr8BJyHF60dnRNeA5k7lAuxg="; + }; + + # will probably be fixed in https://github.com/NixOS/nixpkgs/pull/302481 + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace-fail "-flto" "" + ''; + + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + ]; + + buildInputs = [ + gtk3 + SDL2 + glew + ]; + + # Note: menu.bin cannot be generated yet, because it would + # need the `vasmm68k_mot` executable (part of vbcc for amigaos68k + # Luckily, menu.bin doesn't need to be present for the emulator to function + + makeFlags = [ "HOST_ZLIB=1" ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + + installPhase = '' + runHook preInstall + + # not sure if any executable other than blastem is really needed here + install -Dm755 blastem dis zdis termhelper -t $out/share/blastem + install -Dm644 gamecontrollerdb.txt default.cfg rom.db -t $out/share/blastem + cp -r shaders $out/share/blastem/shaders + + # wrapping instead of sym-linking makes sure argv0 stays at the original location + makeWrapper $out/share/blastem/blastem $out/bin/blastem + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "blastem -v"; + version = "0.6.3-pre"; # remove line when moving to a stable version + }; + + meta = { + description = "The fast and accurate Genesis emulator"; + homepage = "https://www.retrodev.com/blastem/"; + license = lib.licenses.gpl3Plus; + mainProgram = "blastem"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = [ + "i686-linux" + "x86_64-linux" + "x86_64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 5f5f7da0f31da..f0770df909c7f 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -102,7 +102,6 @@ buildNpmPackage rec { license = lib.licenses.gpl3Only; mainProgram = "blockbench"; maintainers = with lib.maintainers; [ - ckie tomasajt ]; }; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 83fab6d81e8f2..6c2e418b0f951 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -28,20 +28,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-XprUu4Dp7ER8YC1uO4kkzTZLsJtoOFH15elnkxUn7/c="; + hash = "sha256-NnRM+ERz5pViQ+rIRXAH3puFdhccpgQMQ+ICZQELA18="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-BVCyZKhSBNJDmhnO68ULj5aMINFQIIlwlGqwjGkOoEI="; + npmDepsHash = "sha256-aw4jOvlfZHCRrgoXT69XrMYe40YXULrfbVG1pQAFGr4="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/butler/package.nix b/pkgs/by-name/bu/butler/package.nix deleted file mode 100644 index 62d215dc5af01..0000000000000 --- a/pkgs/by-name/bu/butler/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, stdenv -, Cocoa -, fetchpatch -}: - -buildGoModule rec { - pname = "butler"; - version = "15.21.0"; - - src = fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM="; - }; - - buildInputs = lib.optionals stdenv.isDarwin [ - Cocoa - ]; - - patches = [ - # update x/sys dependency for darwin build https://github.com/itchio/butler/pull/245 - (fetchpatch { - url = "https://github.com/itchio/butler/pull/245/commits/ef651d373e3061fda9692dd44ae0f7ce215e9655.patch"; - hash = "sha256-rZZn/OGiv3mRyy89uORyJ99zWN21kZCCQAlFvSKxlPU="; - }) - ]; - - proxyVendor = true; - - vendorHash = "sha256-GvUUCQ2BPW0HlXZljBWJ2Wyys9OEIM55dEWAa6J19Zg="; - - doCheck = false; - - meta = with lib; { - # butler cannot be build with Go >=1.21 - # See https://github.com/itchio/butler/issues/256 - # and https://github.com/itchio/dmcunrar-go/issues/1 - # The dependency causing the issue is marked as 'no maintainence intended'. - # Last butler release is from 05/2021. - broken = true; - description = "Command-line itch.io helper"; - homepage = "https://github.com/itchio/butler"; - license = licenses.mit; - maintainers = with maintainers; [ martfont ]; - }; -} diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 1ac91956bd269..81172b56ad6f7 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "c2FmZQ"; - version = "0.4.20"; + version = "0.4.21"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${version}"; - hash = "sha256-ur1zZdDAGl97RDhs0ucc9UAvufI/DG49cn8HaXx3gxs="; + hash = "sha256-i2IO+07Ne3Q5/aBWuAYmkDcDrp5S/yc1eY1vkQI4kgA="; }; ldflags = [ "-s" "-w" ]; sourceRoot = "${src.name}/c2FmZQ"; - vendorHash = "sha256-wZ8+w1UFx55whodAXKhQ4EbtMXkbztYLjpqEVvdrAF8="; + vendorHash = "sha256-cGFI9HSpszi7nXbUCx1MBoj7QOzYseha7+udAbGL+P8="; subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ]; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index d31879bad0910..3193f7eb34318 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-3vQ7pM7Ui0H6qWFWOCW4LzDLJq8bcoFEJrpoa4Tzk9g="; + hash = "sha256-6IPkNTwSh5aYQUd0MBmAeQ+iv0owxHwgdQWcjsdoEnA="; }; - cargoHash = "sha256-4uWPbwntcD4YKdjTlWfMGqM+rddKzaXH1YTX9qLrWrY="; + cargoHash = "sha256-lhlqMaqrmEbv2btOf4awtZfEmMVeHGc1JhCpRRlnr90="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ca/catppuccin-gtk/fix-inconsistent-theme-name.patch b/pkgs/by-name/ca/catppuccin-gtk/fix-inconsistent-theme-name.patch new file mode 100644 index 0000000000000..2a64a449d7549 --- /dev/null +++ b/pkgs/by-name/ca/catppuccin-gtk/fix-inconsistent-theme-name.patch @@ -0,0 +1,32 @@ +The theme name uses `default` as fallback for tweaks when they aren't +set, which not only is not a valid tweak name, but can lead to confusion +and inconsistencies (See: https://github.com/catppuccin/nix/pull/261). +--- + sources/build/context.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sources/build/context.py b/sources/build/context.py +index 3d43c01..6167f14 100644 +--- a/sources/build/context.py ++++ b/sources/build/context.py +@@ -45,7 +45,8 @@ class BuildContext: + return f"{self.output_root}/{self.build_id()}" + + def build_id(self) -> str: +- return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}+{self.tweaks.id() or 'default'}" ++ tweaks = f"+{self.tweaks.id()}" if self.tweaks.id() != "" else "" ++ return f"{self.theme_name}-{self.flavor.identifier}-{self.accent.identifier}-{self.size}" + tweaks + + def apply_suffix(self, suffix: Suffix) -> str: + if suffix.test(self): +@@ -59,6 +60,7 @@ class BuildContext: + Subsitution(find=f"\\${key}: {default}", replace=f"${key}: {value}"), + ) + ++ + IS_DARK = Suffix(true_value="-Dark", test=lambda ctx: ctx.flavor.dark) + IS_LIGHT = Suffix(true_value="-Light", test=lambda ctx: not ctx.flavor.dark) + IS_WINDOW_NORMAL = Suffix( +-- +2.45.1 + diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix index db7a3295903b7..964e631c9cade 100644 --- a/pkgs/by-name/ca/catppuccin-gtk/package.nix +++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix @@ -37,6 +37,8 @@ stdenvNoCC.mkDerivation { hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc="; }; + patches = [ ./fix-inconsistent-theme-name.patch ]; + nativeBuildInputs = [ gtk3 sassc diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index f4e2bceeaefe8..f685076d67270 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.10"; + version = "4.10.1"; src = fetchFromGitHub { owner = "ccache"; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { exit 1 fi ''; - hash = "sha256-YHSr2pnk17QEdrIHInXX2eBFN9OGjdleaB41VLaqlnA="; + hash = "sha256-CUQ16VthGl2vtixOv8UGI9gCsb6iEVD9XHKAYivWMrw="; }; outputs = [ @@ -177,11 +177,11 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }"; license = licenses.gpl3Plus; - mainProgram = "ccache"; maintainers = with maintainers; [ kira-bruneau r-burns ]; platforms = platforms.unix; + mainProgram = "ccache"; }; }) diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 3a009ea0cb3be..259e2fe18967e 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -48,13 +48,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "cemu"; - version = "2.0-86"; + version = "2.0-88"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-AS5Qo4J0U1MeTYWl4jiJMi879bhBuioU1BikxGKtUrE="; + hash = "sha256-ZXJrxfTgwDmHUk3UqA4H4MSEvNNq9lXHXxf9rgWqkro="; }; patches = [ diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix index f6d3f1a9a2f28..9fd6d7df7da72 100644 --- a/pkgs/by-name/ce/centerpiece/package.nix +++ b/pkgs/by-name/ce/centerpiece/package.nix @@ -8,6 +8,7 @@ , rustPlatform , libxkbcommon , wayland +, enableX11 ? true, xorg }: rustPlatform.buildRustPackage rec { @@ -30,7 +31,12 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader wayland - ]; + ] ++ lib.optionals enableX11 (with xorg; [ + libX11 + libXcursor + libXi + libXrandr + ]); postFixup = lib.optional stdenv.isLinux '' rpath=$(patchelf --print-rpath $out/bin/centerpiece) diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/by-name/ch/cheese/package.nix index 9dd578438c502..9ac53092c1144 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/by-name/ch/cheese/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "cheese"; - attrPath = "gnome.cheese"; }; }; @@ -101,7 +100,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; mainProgram = "cheese"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index b9dec059d1f18..4998d2d38a28a 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "chow-kick"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Chowdhury-DSP"; repo = "ChowKick"; rev = "v${finalAttrs.version}"; - sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; + sha256 = "sha256-YYcNiJGGw21aVY03tyQLu3wHCJhxYiDNJZ+LWNbQdj4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 1314c37234668..1d45df4f632e3 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.cecill-c; maintainers = [ lib.maintainers.AndersonTorres - lib.maintainers.lilyinstarlight ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/cl/clangbuildanalyzer/package.nix b/pkgs/by-name/cl/clangbuildanalyzer/package.nix index 21b67fcf44c41..c5dc4f1b40641 100644 --- a/pkgs/by-name/cl/clangbuildanalyzer/package.nix +++ b/pkgs/by-name/cl/clangbuildanalyzer/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tool for analyzing Clang's -ftime-trace files"; homepage = "https://github.com/aras-p/ClangBuildAnalyzer"; - maintainers = with lib.maintainers; [ lf- ]; + maintainers = [ ]; license = lib.licenses.unlicense; platforms = lib.platforms.unix; mainProgram = "ClangBuildAnalyzer"; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 056bf1b59482b..f70e84523d44a 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -8,7 +8,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.7.0"; + version = "3.8.1"; nodejs = nodejs_18; @@ -16,10 +16,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-Ce7lk+zTbyj3HmtIFui9ZA1FThZEytovrPCrmjMyX38="; + hash = "sha256-8dxV57uivjcXz6JHttFNvivcIbNRAwZKSvGv/SST81E="; }; - npmDepsHash = "sha256-VQXljlIHAE2o10cXQlsyhTvBSp3/ycQOJydQGNMiWuk="; + npmDepsHash = "sha256-2lROdsq3tR4SYxMoTJYY6EyHxudS7p7wOJq+RxE2btk="; dontNpmBuild = true; diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index e1cef9cfae547..eac5a000fc601 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "clipse"; - version = "0.0.71"; + version = "1.0.0"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; rev = "v${version}"; - hash = "sha256-88GuYGJO5AgWae6LyMO/TpGqtk2yS7pDPS0MkgmJUQ4="; + hash = "sha256-9r/Ih73eYb45LYOu8HMXqdme/rUwLBI6+gctF603C2w="; }; - vendorHash = "sha256-GIUEx4h3xvLySjBAQKajby2cdH8ioHkv8aPskHN0V+w="; + vendorHash = "sha256-QEBRlwNS8K44chB3fMOJZxYnIaWMnuDySIhKfF7XtxM="; meta = { description = "Useful clipboard manager TUI for Unix"; diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix new file mode 100644 index 0000000000000..40e98dcedf79f --- /dev/null +++ b/pkgs/by-name/cl/cloudflare-utils/package.nix @@ -0,0 +1,25 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "cloudflare-utils"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Cyb3r-Jak3"; + repo = "cloudflare-utils"; + rev = "v${version}"; + sha256 = "sha256-41TQ+St6U4exLSl4dwc1E6K8P+oqQ4m5RSI7L2/dWwI="; + }; + + vendorHash = "sha256-HE6x4KSe9b9ZzcYz7sP25aTeDGU4zXgkYm/1RwYYBt4="; + + meta = { + description = "Helpful Cloudflare utility program"; + homepage = "https://github.com/Cyb3r-Jak3/cloudflare-utils"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [yelite]; + }; +} diff --git a/pkgs/by-name/co/container-structure-test/package.nix b/pkgs/by-name/co/container-structure-test/package.nix new file mode 100644 index 0000000000000..f8ef4728b2d96 --- /dev/null +++ b/pkgs/by-name/co/container-structure-test/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, +}: +let + version = "v1.18.1"; + + sources = { + x86_64-linux = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-linux-amd64"; + hash = "sha256-vnZsdjRix3P7DpDz00WUTbNBLQIFPKzfUbVbxn+1ygM="; + }; + aarch64-linux = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-linux-arm64"; + hash = "sha256-/YPAeh/Ad2YVdZ/irpgikQST0uWITWYQOB4qI54aPlY="; + }; + x86_64-darwin = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-darwin-amd64"; + hash = "sha256-tJ1gMnQ7d6du65fnw5GV425kWl/3jLwcqj3gIHHuOyU="; + }; + aarch64-darwin = { + url = "https://github.com/GoogleContainerTools/container-structure-test/releases/download/${version}/container-structure-test-darwin-arm64"; + hash = "sha256-cNSb3nhSGU9q/PJDNdEeV/hlCXAdXkaV6SROdXnXjp0="; + }; + }; +in +stdenv.mkDerivation { + inherit version; + pname = "container-structure-test"; + src = fetchurl { inherit (sources.${stdenv.system}) url hash; }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + install -Dm755 $src $out/bin/container-structure-test + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/GoogleContainerTools/container-structure-test"; + description = "The Container Structure Tests provide a powerful framework to validate the structure of a container image."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ rubenhoenle ]; + platforms = builtins.attrNames sources; + mainProgram = "container-structure-test"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/co/coyim/package.nix b/pkgs/by-name/co/coyim/package.nix index 2906d324c2ae6..9e8991b5fbe0e 100644 --- a/pkgs/by-name/co/coyim/package.nix +++ b/pkgs/by-name/co/coyim/package.nix @@ -6,7 +6,7 @@ , cairo , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , wrapGAppsHook3 , gtk3 }: @@ -26,7 +26,7 @@ buildGoModule { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ glib cairo gdk-pixbuf gtk3 adwaita-icon-theme ]; meta = { description = "Safe and secure chat client"; diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix new file mode 100644 index 0000000000000..82fc31a7bbdd3 --- /dev/null +++ b/pkgs/by-name/cq/cq/package.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, fetchurl +, buildGraalvmNativeImage +, graalvmCEPackages +}: + +buildGraalvmNativeImage rec { + pname = "cq"; + version = "2024.06.24-12.10"; + + # we need both src (the prebuild jar) + src = fetchurl { + url = "https://github.com/markus-wa/cq/releases/download/${version}/cq.jar"; + hash = "sha256-iULV+j/AuGVYPYhbOTQTKd3n+VZhWQYBRE6cRiaa1/M="; + }; + + # and build-src (for the native-image build process) + build-src = fetchFromGitHub { + owner = "markus-wa"; + repo = "cq"; + rev = version; + hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8="; + }; + + graalvmDrv = graalvmCEPackages.graalvm-ce; + + executable = "cq"; + + # copied verbatim from the upstream build script https://github.com/markus-wa/cq/blob/main/package/build-native.sh#L5 + extraNativeImageBuildArgs = [ + "--report-unsupported-elements-at-runtime" + "--initialize-at-build-time" + "--no-server" + "-H:ReflectionConfigurationFiles=${build-src}/package/reflection-config.json" + ]; + + meta = with lib; { + description = "Clojure Query: A Command-line Data Processor for JSON, YAML, EDN, XML and more"; + homepage = "https://github.com/markus-wa/cq"; + changelog = "https://github.com/markus-wa/cq/releases/releases/tag/${version}"; + license = licenses.epl20; + maintainers = with maintainers; [ farcaller ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix new file mode 100644 index 0000000000000..12ce3f76edeb5 --- /dev/null +++ b/pkgs/by-name/cr/crate2nix/package.nix @@ -0,0 +1,68 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, makeWrapper +, cargo +, nix +, nix-prefetch-git +, installShellFiles +, +}: + +rustPlatform.buildRustPackage rec { + pname = "crate2nix"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = pname; + rev = version; + hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE="; + }; + + sourceRoot = "${src.name}/${pname}"; + + cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE="; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + # Tests use nix(1), which tries (and fails) to set up /nix/var inside the sandbox. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH ":" ${ + lib.makeBinPath [ + cargo + nix + nix-prefetch-git + ] + } + + for shell in bash zsh fish + do + $out/bin/${pname} completions -s $shell + installShellCompletion ${pname}.$shell || installShellCompletion --$shell _${pname} + done + ''; + + meta = with lib; { + description = "Nix build file generator for Rust crates"; + mainProgram = "crate2nix"; + longDescription = '' + Crate2nix generates Nix files from Cargo.toml/lock files + so that you can build every crate individually in a Nix sandbox. + ''; + homepage = "https://github.com/nix-community/crate2nix"; + changelog = "https://nix-community.github.io/crate2nix/90_reference/90_changelog"; + license = licenses.asl20; + maintainers = with maintainers; [ + kolloch + cole-h + kranzes + ]; + }; +} diff --git a/pkgs/by-name/cy/cyclonedds-cxx/package.nix b/pkgs/by-name/cy/cyclonedds-cxx/package.nix index d2f6b14848ce3..e3c4aec9e8f53 100644 --- a/pkgs/by-name/cy/cyclonedds-cxx/package.nix +++ b/pkgs/by-name/cy/cyclonedds-cxx/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "cyclonedds-cxx"; - version = "0.10.4"; + version = "0.10.5"; outputs = ["out" "dev"]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "eclipse-cyclonedds"; repo = "cyclonedds-cxx"; rev = version; - hash = "sha256-/Bb4lhDeJFCZpsf+EfKSJpX5Xv5mFms5miw36be1goQ="; + hash = "sha256-whFVEQec/Ca+dr6R7z9mMrNg315z3oIWchVT+vQ36So="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cy/cyme/Cargo.lock b/pkgs/by-name/cy/cyme/Cargo.lock deleted file mode 100644 index c645e23d1563c..0000000000000 --- a/pkgs/by-name/cy/cyme/Cargo.lock +++ /dev/null @@ -1,1141 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "assert-json-diff" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-targets", -] - -[[package]] -name = "clap" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", - "terminal_size 0.3.0", -] - -[[package]] -name = "clap_complete" -version = "4.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "clap_mangen" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" -dependencies = [ - "clap", - "roff", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" -dependencies = [ - "is-terminal", - "lazy_static", - "windows-sys", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cyme" -version = "1.6.0" -dependencies = [ - "assert-json-diff", - "clap", - "clap_complete", - "clap_mangen", - "colored", - "diff", - "dirs", - "heck", - "itertools", - "lazy_static", - "log", - "rand", - "rusb", - "serde", - "serde_json", - "serde_with", - "simple_logger", - "strum", - "strum_macros", - "terminal_size 0.2.6", - "udev", - "usb-ids", -] - -[[package]] -name = "darling" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.39", -] - -[[package]] -name = "darling_macro" -version = "0.20.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", - "serde", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "errno" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.25", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "git+https://github.com/Emilgardis/libudev-sys/?branch=fix-cross-compilation#808a604d27d0afc1305bbcc5d27c6c083c99dfa4" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "libusb1-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da050ade7ac4ff1ba5379af847a10a10a8e284181e060105bf8d86960ce9ce0f" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "roff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" - -[[package]] -name = "rusb" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9f9ff05b63a786553a4c02943b74b34a988448671001e9a27e2f0565cc05a4" -dependencies = [ - "libc", - "libusb1-sys", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.11", - "windows-sys", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "serde" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "base64", - "chrono", - "hex", - "indexmap", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "simple_logger" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0ca6504625ee1aa5fda33913d2005eab98c7a42dd85f116ecce3ff54c9d3ef" -dependencies = [ - "colored", - "log", - "time", - "windows-sys", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "terminal_size" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" -dependencies = [ - "rustix 0.37.27", - "windows-sys", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix 0.38.25", - "windows-sys", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "time" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -dependencies = [ - "deranged", - "itoa", - "libc", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -dependencies = [ - "time-core", -] - -[[package]] -name = "udev" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" -dependencies = [ - "io-lifetimes", - "libc", - "libudev-sys", - "pkg-config", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "usb-ids" -version = "1.2023.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8af4170a2e6ebc0e18ce6024c8c844bc07f3101ab5d1ad7dedfd1c6fb116cb" -dependencies = [ - "nom", - "phf", - "phf_codegen", - "proc-macro2", - "quote", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 5c854b55893f3..913f8768f951b 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -6,7 +6,6 @@ , stdenv , darwin , libusb1 -, udev , nix-update-script , testers , cyme @@ -14,21 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-HIOrdVChTfYX8AKqytWU+EudFDiqoVELb+yL3jsPQwM="; + hash = "sha256-iDwH4gSpt1XkwMBj0Ut26c9PpsHcxFrRE6VuBNhpIHk="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "libudev-sys-0.1.4" = "sha256-7dUqPH8bQ/QSBIppxQbymwQ44Bvi1b6N2AMUylbyKK8="; - }; - }; + cargoHash = "sha256-bzOqk0nXhqq4WX9razPo1q6BkEl4VZ5QMPiNEwHO/eM="; nativeBuildInputs = [ pkg-config @@ -38,11 +32,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libusb1 - ] ++ lib.optionals stdenv.isLinux [ - udev ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = [ + # doctest that requires access outside sandbox + "--skip=udev::hwdb::get" + ] ++ lib.optionals stdenv.isDarwin [ # system_profiler is not available in the sandbox "--skip=test_run" ]; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index fdf03e4592914..ca21fc82c8755 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -10,6 +10,7 @@ , gobject-introspection , gtk4 , pango +, overrideSDK , pkg-config , rustPlatform , testers @@ -28,8 +29,12 @@ let hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; }; cargoHash = "sha256-GOX7V6NLEMP06nMeRZINwcWCaHwK6T3nkRKl4e25DPg="; + + buildRustPackage' = rustPlatform.buildRustPackage.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; in -rustPlatform.buildRustPackage { +buildRustPackage' { inherit pname version src cargoHash; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/by-name/da/dart-sass/package.nix index f3e30557ae9bd..579f96ce9b0f3 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -1,12 +1,13 @@ -{ lib -, fetchFromGitHub -, buildDartApplication -, buf -, protoc-gen-dart -, testers -, dart-sass -, runCommand -, writeText +{ + lib, + fetchFromGitHub, + buildDartApplication, + buf, + protoc-gen-dart, + testers, + dart-sass, + runCommand, + writeText, }: let @@ -21,13 +22,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.77.4"; + version = "1.77.6"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-xHOZDeK6xYnfrb6yih6jzRDZLRvyp0EeKZynEq3A4aI="; + hash = "sha256-GiZbx60HtyFTsargh0UVhjzOwlw3VWkhUEaX0s2ehos="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -45,14 +46,6 @@ buildDartApplication rec { dartCompileFlags = [ "--define=version=${version}" ]; - meta = with lib; { - homepage = "https://github.com/sass/dart-sass"; - description = "Reference implementation of Sass, written in Dart"; - mainProgram = "sass"; - license = licenses.mit; - maintainers = with maintainers; [ lelgenio ]; - }; - passthru = { inherit embedded-protocol-version embedded-protocol; updateScript = ./update.sh; @@ -67,21 +60,31 @@ buildDartApplication rec { expected = writeText "expected" '' body h1{color:#123} ''; - actual = runCommand "actual" - { - nativeBuildInputs = [ dart-sass ]; - base = writeText "base" '' - body { - $color: #123; - h1 { - color: $color; + actual = + runCommand "actual" + { + nativeBuildInputs = [ dart-sass ]; + base = writeText "base" '' + body { + $color: #123; + h1 { + color: $color; + } } - } + ''; + } + '' + dart-sass --style=compressed $base > $out ''; - } '' - dart-sass --style=compressed $base > $out - ''; }; }; }; + + meta = { + homepage = "https://github.com/sass/dart-sass"; + description = "Reference implementation of Sass, written in Dart"; + mainProgram = "sass"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lelgenio ]; + }; } diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index da5e7ea435f1f..8c3f3c83dce3d 100644 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -674,31 +674,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", + "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.5" + "version": "1.25.7" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.7.2" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", + "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.2" + "version": "0.6.4" }, "test_descriptor": { "dependency": "direct dev", @@ -754,11 +754,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a", + "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.3" + "version": "14.2.4" }, "watcher": { "dependency": "direct main", diff --git a/pkgs/development/tools/misc/dart-sass/update.sh b/pkgs/by-name/da/dart-sass/update.sh index 595349e1387c2..595349e1387c2 100755 --- a/pkgs/development/tools/misc/dart-sass/update.sh +++ b/pkgs/by-name/da/dart-sass/update.sh diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/by-name/dc/dconf-editor/package.nix index 2b1b747a74a2c..44fca17bec32c 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/by-name/dc/dconf-editor/package.nix @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch b/pkgs/by-name/dc/dconf-editor/schema-override-variable.patch index 06896d1aa4ee8..06896d1aa4ee8 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch +++ b/pkgs/by-name/dc/dconf-editor/schema-override-variable.patch diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/by-name/de/devhelp/package.nix index 4a6577adbe256..97795c1d9f7a0 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , gnome +, adwaita-icon-theme , gtk3 , wrapGAppsHook3 , glib @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { glib gtk3 webkitgtk_4_1 - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas ]; @@ -72,7 +73,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "devhelp"; - attrPath = "gnome.devhelp"; }; }; diff --git a/pkgs/by-name/di/discordchatexporter-cli/deps.nix b/pkgs/by-name/di/discordchatexporter-cli/deps.nix index db36b866f0504..bd03e52a0d0c1 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/deps.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/deps.nix @@ -16,6 +16,8 @@ (fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; sha256 = "0fhl96p3xjd5k1wwvhs80cp35rrlgnza6mw9vy0knhmf7ji9b95n"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.3"; sha256 = "0jkl986gnh2a39v5wbab47qyh1g9a64dgh5s67vppcay8hd42c4n"; }) (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.16.0"; sha256 = "0cbkgrrkam76bhygrjzd4nj4mpzpgbnsddfzwry1933rcvjlqh6m"; }) - (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.14"; sha256 = "12w9zz6y7cdw6p2gvr34r4qcl35hh19zn9fm0risrrcs8577msxs"; }) + (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.16"; sha256 = "1f6d47g1qmmahx6pn2sp0fff7hsmdqwm7z09j47hs6r1yn9a7kyj"; }) ] diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index a1b5574ca9a3d..157571269688e 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.43.1"; + version = "2.43.3"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - hash = "sha256-MLOWZJehajB002SqBW2HJTjr00eU9RV+Weu3rmgoEew="; + hash = "sha256-r9bvTgqKQY605BoUlysSz4WJMxn2ibNh3EhoMYCfV3c="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index f31256ad85811..bff13f92f422a 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dorion"; - version = "4.3.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; - hash = "sha256-bVanhJqHQxe3imP07EsRuDu0Isj9rf4VoIjmoAPfaQk="; + hash = "sha256-cCZikTZ+IU3mq/FkJfeggXLyWIsWG+a2qu1GbgW93WQ="; }; unpackCmd = '' diff --git a/pkgs/by-name/dt/dtools/package.nix b/pkgs/by-name/dt/dtools/package.nix index 8db3a14cf6173..9d5812ec9fd2a 100644 --- a/pkgs/by-name/dt/dtools/package.nix +++ b/pkgs/by-name/dt/dtools/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtools"; - version = "2.109.0"; + version = "2.109.1"; src = fetchFromGitHub { owner = "dlang"; repo = "tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-C4hSs4zsFC8hWkhmDmNzVfK7Ctfnd1IQUphibUPiVzE="; + hash = "sha256-Pfj8Kwf5AlcrHhLs5A/0vIFWLZaNR3ro+esbs7oWN9I="; name = "dtools"; }; diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index 897f5cfc5b798..599abeaa122af 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-Pv7GySqKD3G1eryq6YwVL159XuuWB8DmQ0d1fPuFcmc="; + hash = "sha256-T/EFy89CZyBthfxGlCJtovDmcR1ntYFkgAOA/sg3GWs="; }; - cargoHash = "sha256-MKJCpSdf9MzpBmgWImYO5+uSVN9uTLaLl4khizVGoig="; + cargoHash = "sha256-nF8govoQILX6ft5iJWHAMQA/UgeNrkdUNulO+sX2jXo="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix new file mode 100644 index 0000000000000..4d4e038f85f02 --- /dev/null +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitLab, pkg-config, dbus }: + +rustPlatform.buildRustPackage rec { + pname = "ear2ctl"; + version = "0.1.0"; + + src = fetchFromGitLab { + owner = "bharadwaj-raju"; + repo = "ear2ctl"; + rev = version; + hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc="; + }; + + cargoHash = "sha256-ax+/lvdEOjLnwE3Gvji7aaeF9KXjoOXdlTvxYDo8wGI="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ dbus ]; + + meta = { + description = "Linux controller for the Nothing Ear (2)"; + homepage = "https://gitlab.com/bharadwaj-raju/ear2ctl"; + maintainers = with lib.maintainers; [ jaredmontoya ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + mainProgram = "ear2ctl"; + }; +} diff --git a/pkgs/by-name/em/ember-cli/package.json b/pkgs/by-name/em/ember-cli/package.json new file mode 100644 index 0000000000000..48cd3aa8543b0 --- /dev/null +++ b/pkgs/by-name/em/ember-cli/package.json @@ -0,0 +1,182 @@ +{ + "name": "ember-cli", + "version": "5.3.0", + "description": "Command line tool for developing ambitious ember.js apps", + "keywords": [ + "app", + "app-kit", + "blockchain", + "cli", + "ember", + "ember-app-kit", + "ember.js", + "kit" + ], + "homepage": "https://cli.emberjs.com/release/", + "bugs": { + "url": "https://github.com/ember-cli/ember-cli/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/ember-cli/ember-cli.git" + }, + "license": "MIT", + "author": "Stefan Penner, Robert Jackson and ember-cli contributors", + "main": "lib/cli/index.js", + "bin": { + "ember": "./bin/ember" + }, + "scripts": { + "docs": "yuidoc", + "lint": "eslint . --cache", + "prepack": "yarn docs", + "test": "node --unhandled-rejections=strict tests/runner", + "test:all": "node --unhandled-rejections=strict tests/runner all", + "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all", + "test:debug": "node --unhandled-rejections=strict debug tests/runner", + "test:slow": "node --unhandled-rejections=strict tests/runner slow" + }, + "dependencies": { + "@babel/core": "^7.22.10", + "@pnpm/find-workspace-dir": "^6.0.2", + "broccoli": "^3.5.2", + "broccoli-builder": "^0.18.14", + "broccoli-concat": "^4.2.5", + "broccoli-config-loader": "^1.0.1", + "broccoli-config-replace": "^1.1.2", + "broccoli-debug": "^0.6.5", + "broccoli-funnel": "^3.0.8", + "broccoli-funnel-reducer": "^1.0.0", + "broccoli-merge-trees": "^4.2.0", + "broccoli-middleware": "^2.1.1", + "broccoli-slow-trees": "^3.1.0", + "broccoli-source": "^3.0.1", + "broccoli-stew": "^3.0.0", + "calculate-cache-key-for-tree": "^2.0.0", + "capture-exit": "^2.0.0", + "chalk": "^4.1.2", + "ci-info": "^3.8.0", + "clean-base-url": "^1.0.0", + "compression": "^1.7.4", + "configstore": "^5.0.1", + "console-ui": "^3.1.2", + "core-object": "^3.1.5", + "dag-map": "^2.0.2", + "diff": "^5.1.0", + "ember-cli-is-package-missing": "^1.0.0", + "ember-cli-lodash-subset": "^2.0.1", + "ember-cli-normalize-entity-name": "^1.0.0", + "ember-cli-preprocess-registry": "^5.0.1", + "ember-cli-string-utils": "^1.1.0", + "ensure-posix-path": "^1.1.1", + "execa": "^5.1.1", + "exit": "^0.1.2", + "express": "^4.18.1", + "filesize": "^10.0.8", + "find-up": "^5.0.0", + "find-yarn-workspace-root": "^2.0.0", + "fixturify-project": "^2.1.1", + "fs-extra": "^11.1.1", + "fs-tree-diff": "^2.0.1", + "get-caller-file": "^2.0.5", + "git-repo-info": "^2.1.1", + "glob": "^8.1.0", + "heimdalljs": "^0.2.6", + "heimdalljs-fs-monitor": "^1.1.1", + "heimdalljs-graph": "^1.0.0", + "heimdalljs-logger": "^0.1.10", + "http-proxy": "^1.18.1", + "inflection": "^2.0.1", + "inquirer": "^9.1.5", + "is-git-url": "^1.0.0", + "is-language-code": "^3.1.0", + "isbinaryfile": "^5.0.0", + "leek": "0.0.24", + "lodash.template": "^4.5.0", + "markdown-it": "^13.0.1", + "markdown-it-terminal": "^0.4.0", + "minimatch": "^7.4.3", + "morgan": "^1.10.0", + "nopt": "^3.0.6", + "npm-package-arg": "^10.1.0", + "os-locale": "^5.0.0", + "p-defer": "^3.0.0", + "portfinder": "^1.0.32", + "promise-map-series": "^0.3.0", + "promise.hash.helper": "^1.0.8", + "quick-temp": "^0.1.8", + "remove-types": "^1.0.0", + "resolve": "^1.22.1", + "resolve-package-path": "^4.0.3", + "safe-stable-stringify": "^2.4.3", + "sane": "^5.0.1", + "semver": "^7.3.5", + "silent-error": "^1.1.1", + "sort-package-json": "^1.57.0", + "symlink-or-copy": "^1.3.1", + "temp": "0.9.4", + "testem": "^3.10.1", + "tiny-lr": "^2.0.0", + "tree-sync": "^2.1.0", + "uuid": "^9.0.0", + "walk-sync": "^3.0.0", + "watch-detector": "^1.0.2", + "workerpool": "^6.4.0", + "yam": "^1.0.0" + }, + "devDependencies": { + "@octokit/rest": "^19.0.7", + "broccoli-plugin": "^4.0.3", + "broccoli-test-helper": "^2.0.0", + "chai": "^4.3.7", + "chai-as-promised": "^7.1.1", + "chai-files": "^1.4.0", + "chai-jest-snapshot": "^2.0.0", + "ember-cli-blueprint-test-helpers": "^0.19.2", + "ember-cli-internal-test-helpers": "^0.9.1", + "eslint": "^8.44.0", + "eslint-config-prettier": "^8.9.0", + "eslint-plugin-chai-expect": "^3.0.0", + "eslint-plugin-mocha": "^10.1.0", + "eslint-plugin-n": "^16.0.1", + "eslint-plugin-prettier": "^4.2.1", + "fixturify": "^3.0.0", + "jsdom": "^21.1.1", + "latest-version": "^5.1.0", + "mocha": "^10.0.0", + "nock": "^13.3.0", + "nyc": "^15.1.0", + "prettier": "2.8.7", + "release-it": "^15.10.0", + "rimraf": "^3.0.2", + "strip-ansi": "^6.0.0", + "supertest": "^6.3.1", + "testdouble": "^3.18.0", + "tmp": "^0.2.1", + "websocket": "^1.0.32", + "which": "3.0.1", + "yuidoc-ember-cli-theme": "^1.0.4", + "yuidocjs": "0.10.2" + }, + "engines": { + "node": ">= 16" + }, + "publishConfig": { + "registry": "https://registry.npmjs.org" + }, + "release-it": { + "git": { + "tagName": "v${version}" + }, + "github": { + "draft": true, + "release": true, + "tokenRef": "GITHUB_AUTH" + } + }, + "trackingCode": "UA-49225444-1", + "volta": { + "node": "16.19.1", + "yarn": "1.22.19" + } +} diff --git a/pkgs/by-name/em/ember-cli/package.nix b/pkgs/by-name/em/ember-cli/package.nix new file mode 100644 index 0000000000000..86f627be950e5 --- /dev/null +++ b/pkgs/by-name/em/ember-cli/package.nix @@ -0,0 +1,35 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +let + pname = "ember-cli"; + version = "5.3.0"; + src = fetchFromGitHub { + owner = "ember-cli"; + repo = "ember-cli"; + rev = "v${version}"; + hash = "sha256-xkMsPE+iweIV14m4kE4ytEp4uHMJW6gr+n9oJblr4VQ="; + }; +in +mkYarnPackage { + inherit pname version src; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-QgT2JFvMupJo+pJc13n2lmHMZkROJRJWoozCho3E6+c="; + }; + + packageJSON = ./package.json; + + meta = with lib; { + homepage = "https://github.com/ember-cli/ember-cli"; + description = "The Ember.js command line utility"; + license = licenses.mit; + maintainers = with maintainers; [ jfvillablanca ]; + platforms = platforms.all; + mainProgram = "ember"; + }; +} diff --git a/pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch b/pkgs/by-name/eo/eog/fix-gir-lib-path.patch index eb087b58a3176..eb087b58a3176 100644 --- a/pkgs/desktops/gnome/core/eog/fix-gir-lib-path.patch +++ b/pkgs/by-name/eo/eog/fix-gir-lib-path.patch diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/by-name/eo/eog/package.nix index b59eb108c0149..ec1e7f61ee512 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/by-name/eo/eog/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/by-name/ep/epiphany/package.nix index c4edd298aff75..c4edd298aff75 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/by-name/ep/epiphany/package.nix diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/by-name/ev/evince/package.nix index a9192f33d000a..a9192f33d000a 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/by-name/ev/evince/package.nix diff --git a/pkgs/desktops/gnome/core/evolution-data-server/drop-tentative-settings-constructor.patch b/pkgs/by-name/ev/evolution-data-server/drop-tentative-settings-constructor.patch index a86d1966eb6bc..a86d1966eb6bc 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/drop-tentative-settings-constructor.patch +++ b/pkgs/by-name/ev/evolution-data-server/drop-tentative-settings-constructor.patch diff --git a/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch b/pkgs/by-name/ev/evolution-data-server/fix-paths.patch index 334235516591f..334235516591f 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch +++ b/pkgs/by-name/ev/evolution-data-server/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 140e124fe4bbb..140e124fe4bbb 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index d774ea2f26853..d774ea2f26853 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index a100139b00c36..788a47db81a91 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.20"; + version = "0.18.21"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-yhrzjm6agMshdjCkK88aGXd0aM9Uurs1GeAA3w/umqI="; + hash = "sha256-d1xY0yu28a+TfIMUlQN/v3UgfhVVmQL9jGLJVc8o/Xc="; }; - cargoHash = "sha256-AJH+fZFaSSgRLIsDu5GVe4d9MI2e4N2DvWZ2JOZx+pM="; + cargoHash = "sha256-w8xAk4eBXAOD93IIjD5MIDerPMSvw2IN9QTOKc04DK4="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fa/fastapi-cli/package.nix b/pkgs/by-name/fa/fastapi-cli/package.nix new file mode 100644 index 0000000000000..f940531aa46c6 --- /dev/null +++ b/pkgs/by-name/fa/fastapi-cli/package.nix @@ -0,0 +1,42 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "fastapi-cli"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tiangolo"; + repo = "fastapi-cli"; + rev = "refs/tags/${version}"; + hash = "sha256-eWvZn7ZeLnQZAvGOzY77o6oO5y+QV2cx+peBov9YpJE="; + }; + + build-system = [ python3.pkgs.pdm-backend ]; + + dependencies = with python3.pkgs; [ + rich + typer + ]; + + optional-dependencies = with python3.pkgs; { + standard = [ + fastapi + uvicorn + ]; + }; + + pythonImportsCheck = [ "fastapi_cli" ]; + + meta = { + description = "Run and manage FastAPI apps from the command line with FastAPI CLI"; + homepage = "https://github.com/tiangolo/fastapi-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "fastapi-cli"; + }; +} diff --git a/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix new file mode 100644 index 0000000000000..dba53dbe887fc --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-pinyin-minecraft/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + nix-update-script, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-minecraft"; + version = "0.1.20240629"; + + src = fetchurl { + url = "https://github.com/oldherl/fcitx5-pinyin-minecraft/releases/download/${finalAttrs.version}/minecraft-cn.dict"; + hash = "sha256-uD/ADL+JGdSYiNz6XIqJB0Y0IU6Jf56q5g7xG2o3a+E="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/minecraft.dict + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.minecraft.wiki"; + homepage = "https://github.com/oldherl/fcitx5-pinyin-minecraft"; + license = with lib.licenses; [ unlicense cc-by-nc-sa-30 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix new file mode 100644 index 0000000000000..624e00913428c --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchurl, + nix-update-script, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-moegirl"; + version = "20240609"; + + src = fetchurl { + url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; + hash = "sha256-dXFV0kVr8hgT17Jmr28PiYTiELm8kS/KM71igHXA6hs="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/moegirl.dict + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.moegirl.org.cn"; + homepage = "https://github.com/outloudvi/mw2fcitx"; + license = with lib.licenses; [ unlicense cc-by-nc-sa-30 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix new file mode 100644 index 0000000000000..c28c18ae63c57 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-pinyin-zhwiki/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchurl, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-pinyin-zhwiki"; + version = "0.2.5"; + date = "20240509"; + + src = fetchurl { + url = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki/releases/download/${finalAttrs.version}/zhwiki-${finalAttrs.date}.dict"; + hash = "sha256-uRpKPq+/xJ8akKB8ol/JRF79VfDIQ8L4SxLDXzpfPxg="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fcitx5/pinyin/dictionaries/zhwiki.dict + + runHook postInstall + ''; + + meta = { + description = "Fcitx 5 pinyin dictionary from zh.wikipedia.org"; + homepage = "https://github.com/felixonmars/fcitx5-pinyin-zhwiki"; + license = with lib.licenses; [ unlicense cc-by-sa-40 ]; + maintainers = with lib.maintainers; [ Guanran928 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index 73ec95ab3bf94..d8bacf16658d1 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -5,10 +5,10 @@ let pname = "fflogs"; - version = "8.5.16"; + version = "8.5.25"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-eUXri4aVMnZtXzCDL3NZTdCR7y0VD5kG4D9YfXQVuzo="; + hash = "sha256-GrN19ONZ4a400d3BM7bdpR/+v0F4Q13+zcGqvDBcEPU="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/fg/fgqcanvas/package.nix b/pkgs/by-name/fg/fgqcanvas/package.nix index 3eaba03af56bc..f64c4881d8236 100644 --- a/pkgs/by-name/fg/fgqcanvas/package.nix +++ b/pkgs/by-name/fg/fgqcanvas/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "Qt-based remote canvas application for FlightGear"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nayala ]; + maintainers = with maintainers; []; mainProgram = "fgqcanvas"; }; } diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/by-name/fi/file-roller/package.nix index d1af3b91db88c..497bfe4920c91 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "file-roller"; - attrPath = "gnome.file-roller"; }; }; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 3d78e105cecf5..1052fd62ca973 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.72"; + version = "2.13.80"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-u5hAUGGaMpUub4WL8CGEzbnfXPRouaGbb8SQ6ep3X3Q="; + hash = "sha256-uwWdmDCmFyArvzVFTOfdBqHglsap/wvyOjRq9KLFyOE="; }; - vendorHash = "sha256-y4XZeugjqy6ydAq6KQ8iIgMgE6iHAEqzzi2A+N1LB3M="; + vendorHash = "sha256-VCsNI6MnraE9orrHCAVRZg3uYxhicuyBT3+Jp5q8DDc="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix new file mode 100644 index 0000000000000..9d6d222e77b43 --- /dev/null +++ b/pkgs/by-name/fi/finamp/package.nix @@ -0,0 +1,71 @@ +{ lib +, flutter322 +, mpv-unwrapped +, xdg-user-dirs +, patchelf +, fetchFromGitHub +, copyDesktopItems +, makeDesktopItem +}: +let + version = "0.9.8-beta"; +in +flutter322.buildFlutterApplication { + inherit version; + pname = "finamp"; + src = fetchFromGitHub { + owner = "jmshrv"; + repo = "finamp"; + rev = version; + hash = "sha256-lvjhA+hdCXgDsrNhNw4Tiq6ZgkYlPuMeHha8OJNF1TI="; + }; + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ patchelf copyDesktopItems ]; + buildInputs = [ mpv-unwrapped ]; + + gitHashes = { + balanced_text = "sha256-lSDR5dDjZ4garRbBPI+wSxC5iScg8wVSD5kymmLbYbk="; + isar_generator = "sha256-lWnHmZmYx7qDG6mzyDqYt+Xude2xVOH1VW+BoDCas60="; + media_kit_libs_windows_audio = "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs="; + palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0="; + split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="; + }; + + postFixup = '' + patchelf $out/app/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]} + ''; + + postInstall = '' + install -Dm644 $src/assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg + ''; + + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + + desktopItems = [(makeDesktopItem { + name = "Finamp"; + desktopName = "Finamp"; + genericName = "Music Player"; + exec = "finamp"; + icon = "finamp"; + startupWMClass = "finamp"; + comment = "An open source Jellyfin music player"; + categories = [ + "AudioVideo" + "Audio" + "Player" + "Music" + ]; + })]; + + meta = { + description = "Open source Jellyfin music player"; + homepage = "https://github.com/jmshrv/finamp"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ dseelp ]; + mainProgram = "finamp"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json new file mode 100644 index 0000000000000..7610d2aeb04b1 --- /dev/null +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -0,0 +1,2093 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "analyzer_plugin": { + "dependency": "transitive", + "description": { + "name": "analyzer_plugin", + "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.3" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.0" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_service": { + "dependency": "direct main", + "description": { + "name": "audio_service", + "sha256": "4547c312a94f9cb2c48b60823fb190767cbd63454a83c73049384d5d3cba4650", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.13" + }, + "audio_service_mpris": { + "dependency": "direct main", + "description": { + "name": "audio_service_mpris", + "sha256": "a8d1583f9143d17b2facc994a99bd1ea257cec43adcb8d7349458555c62b570f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "audio_service_platform_interface": { + "dependency": "direct main", + "description": { + "name": "audio_service_platform_interface", + "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "audio_service_web": { + "dependency": "transitive", + "description": { + "name": "audio_service_web", + "sha256": "9d7d5ae5f98a5727f2580fad73062f2484f400eef6cef42919413268e62a363e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "audio_session": { + "dependency": "direct main", + "description": { + "name": "audio_session", + "sha256": "a49af9981eec5d7cd73b37bacb6ee73f8143a6a9f9bd5b6021e6c346b9b6cf4e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.19" + }, + "auto_size_text": { + "dependency": "direct main", + "description": { + "name": "auto_size_text", + "sha256": "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "background_downloader": { + "dependency": "direct main", + "description": { + "name": "background_downloader", + "sha256": "9504093db43da6095c44dd14fc816f3ee8961633ace12340f5d3c4fbfd346e2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.5.2" + }, + "balanced_text": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4", + "resolved-ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4", + "url": "https://github.com/Komodo5197/flutter-balanced-text.git" + }, + "source": "git", + "version": "0.0.3" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.10" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "chopper": { + "dependency": "direct main", + "description": { + "name": "chopper", + "sha256": "779a7bc5c7af2e45bd35c49698f2b6fabc23ac053b622294369bbb079eeb8920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "chopper_generator": { + "dependency": "direct dev", + "description": { + "name": "chopper_generator", + "sha256": "f7f4913d14bbec24b5cc3c5270f47a3a218bd1c764d7ed3eb0bf4574913208f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "ci": { + "dependency": "transitive", + "description": { + "name": "ci", + "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clipboard": { + "dependency": "direct main", + "description": { + "name": "clipboard", + "sha256": "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "color": { + "dependency": "transitive", + "description": { + "name": "color", + "sha256": "ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+1" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "custom_lint": { + "dependency": "direct dev", + "description": { + "name": "custom_lint", + "sha256": "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.4" + }, + "custom_lint_builder": { + "dependency": "transitive", + "description": { + "name": "custom_lint_builder", + "sha256": "d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.4" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.6" + }, + "dartx": { + "dependency": "transitive", + "description": { + "name": "dartx", + "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "device_info_plus": { + "dependency": "direct main", + "description": { + "name": "device_info_plus", + "sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.0" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "fading_edge_scrollview": { + "dependency": "transitive", + "description": { + "name": "fading_edge_scrollview", + "sha256": "c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.3" + }, + "file_sizes": { + "dependency": "direct main", + "description": { + "name": "file_sizes", + "sha256": "d24964a4b194b6116d490005428d07cb3e83834ad1f7ec6a1012dedc2f6d2a19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_blurhash": { + "dependency": "direct main", + "description": { + "name": "flutter_blurhash", + "sha256": "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.2" + }, + "flutter_cache_manager": { + "dependency": "direct main", + "description": { + "name": "flutter_cache_manager", + "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "flutter_gen_core": { + "dependency": "transitive", + "description": { + "name": "flutter_gen_core", + "sha256": "b9894396b2a790cc2d6eb3ed86e5e113aaed993765b21d4b981c9da4476e0f52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0+1" + }, + "flutter_gen_runner": { + "dependency": "direct dev", + "description": { + "name": "flutter_gen_runner", + "sha256": "b4c4c54e4dd89022f5e405fe96f16781be2dfbeabe8a70ccdf73b7af1302c655", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0+1" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.19" + }, + "flutter_riverpod": { + "dependency": "direct main", + "description": { + "name": "flutter_riverpod", + "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "e12415c3bce49bcbc3fed383f0ea41ad7d828f6cf0eccba0588ffa5a812fe522", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.82.1" + }, + "flutter_staggered_grid_view": { + "dependency": "transitive", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_sticky_header": { + "dependency": "direct main", + "description": { + "name": "flutter_sticky_header", + "sha256": "017f398fbb45a589e01491861ca20eb6570a763fd9f3888165a978e11248c709", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "flutter_tabler_icons": { + "dependency": "direct main", + "description": { + "name": "flutter_tabler_icons", + "sha256": "5c27597ed7e3a7f8ae5a3d6aa2c27223fdd3da165c08a4879083c394acfa3678", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.29.0" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_to_airplay": { + "dependency": "direct main", + "description": { + "name": "flutter_to_airplay", + "sha256": "9ed02327954d2bdb28d529198bedb1b6ab993be08125fdff46af2c5e5f245983", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "flutter_vibrate": { + "dependency": "direct main", + "description": { + "name": "flutter_vibrate", + "sha256": "9cc9b32cf52c90dd34c1cf396ed40010b2c74e69adbb0ff16005afa900971ad8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "freezed_annotation": { + "dependency": "transitive", + "description": { + "name": "freezed_annotation", + "sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "get_it": { + "dependency": "direct main", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "hashcodes": { + "dependency": "transitive", + "description": { + "name": "hashcodes", + "sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "hive": { + "dependency": "direct main", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "hive_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_generator", + "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "hotreloader": { + "dependency": "transitive", + "description": { + "name": "hotreloader", + "sha256": "ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "image_size_getter": { + "dependency": "transitive", + "description": { + "name": "image_size_getter", + "sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "infinite_scroll_pagination": { + "dependency": "direct main", + "description": { + "name": "infinite_scroll_pagination", + "sha256": "b68bce20752fcf36c7739e60de4175494f74e99e9a69b4dd2fe3a1dd07a7f16a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "isar": { + "dependency": "direct main", + "description": { + "name": "isar", + "sha256": "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "isar_flutter_libs": { + "dependency": "direct main", + "description": { + "name": "isar_flutter_libs", + "sha256": "bc6768cc4b9c61aabff77152e7f33b4b17d2fc93134f7af1c3dd51500fe8d5e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "isar_generator": { + "dependency": "direct dev", + "description": { + "path": "packages/isar_generator", + "ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", + "resolved-ref": "70a5abd2b36d265a2eef0141f98f312a8710e60c", + "url": "https://github.com/ndelanou/isar.git" + }, + "source": "git", + "version": "3.1.0+1" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "just_audio": { + "dependency": "direct main", + "description": { + "name": "just_audio", + "sha256": "5abfab1d199e01ab5beffa61b3e782350df5dad036cb8c83b79fa45fc656614e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.38" + }, + "just_audio_media_kit": { + "dependency": "direct main", + "description": { + "name": "just_audio_media_kit", + "sha256": "bbecbd43959c230d9f9610df0e0165855e711b4c960ce730c08f31107cc3bd26", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "just_audio_platform_interface": { + "dependency": "transitive", + "description": { + "name": "just_audio_platform_interface", + "sha256": "0243828cce503c8366cc2090cefb2b3c871aa8ed2f520670d76fd47aa1ab2790", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "just_audio_web": { + "dependency": "transitive", + "description": { + "name": "just_audio_web", + "sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.11" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.4" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "locale_names": { + "dependency": "direct main", + "description": { + "name": "locale_names", + "sha256": "7a89ca54072f4f13d0f5df5a9ba69337554bf2fd057d1dd2a238898f3f159374", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "marquee": { + "dependency": "direct main", + "description": { + "name": "marquee", + "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "media_kit": { + "dependency": "transitive", + "description": { + "name": "media_kit", + "sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.10+1" + }, + "media_kit_libs_linux": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_linux", + "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "media_kit_libs_windows_audio": { + "dependency": "direct main", + "description": { + "path": "libs/windows/media_kit_libs_windows_audio", + "ref": "475a08cc97b94702f774bc906e1472b5bddc932b", + "resolved-ref": "475a08cc97b94702f774bc906e1472b5bddc932b", + "url": "https://github.com/Komodo5197/media-kit.git" + }, + "source": "git", + "version": "1.0.9" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "mini_music_visualizer": { + "dependency": "direct main", + "description": { + "name": "mini_music_visualizer", + "sha256": "779a957424ce9a09cc00989a8cf9b7541ec22316d9781a43e701afa6acacf274", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "msix": { + "dependency": "direct dev", + "description": { + "name": "msix", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.7" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "octo_image": { + "dependency": "direct main", + "description": { + "name": "octo_image", + "sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "palette_generator": { + "dependency": "direct main", + "description": { + "path": "packages/palette_generator", + "ref": "4992c3b", + "resolved-ref": "4992c3b987d5d3b04c57f5ed3589e02f7988ff4c", + "url": "https://github.com/jmshrv/packages.git" + }, + "source": "git", + "version": "0.3.4" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.3.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "8bb852cd759488893805c3161d0b2b5db55db52f773dbb014420b304055ba2c5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.6" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.4" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.1" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "provider": { + "dependency": "direct main", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, + "puppeteer": { + "dependency": "transitive", + "description": { + "name": "puppeteer", + "sha256": "c45c51b4ad8d70acdffeb1cfb9d16b60a7eaab7bfef314dd5b02c3607269b556", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.11.0" + }, + "qs_dart": { + "dependency": "transitive", + "description": { + "name": "qs_dart", + "sha256": "5f1827ccdfa061582c121e7a8fe4a83319fa455bcd1fd6e46ff5b17b57aed680", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "recursive_regex": { + "dependency": "transitive", + "description": { + "name": "recursive_regex", + "sha256": "f7252e3d3dfd1665e594d9fe035eca6bc54139b1f2fee38256fa427ea41adc60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.1" + }, + "riverpod_analyzer_utils": { + "dependency": "transitive", + "description": { + "name": "riverpod_analyzer_utils", + "sha256": "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "riverpod_annotation": { + "dependency": "direct main", + "description": { + "name": "riverpod_annotation", + "sha256": "e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.5" + }, + "riverpod_generator": { + "dependency": "direct dev", + "description": { + "name": "riverpod_generator", + "sha256": "d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "riverpod_lint": { + "dependency": "direct dev", + "description": { + "name": "riverpod_lint", + "sha256": "3c67c14ccd16f0c9d53e35ef70d06cd9d072e2fb14557326886bbde903b230a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.10" + }, + "rxdart": { + "dependency": "direct main", + "description": { + "name": "rxdart", + "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.27.7" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "scroll_to_index": { + "dependency": "direct main", + "description": { + "name": "scroll_to_index", + "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "simple_gesture_detector": { + "dependency": "direct main", + "description": { + "name": "simple_gesture_detector", + "sha256": "ba2cd5af24ff20a0b8d609cec3f40e5b0744d2a71804a2616ae086b9c19d19a3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "sliver_tools": { + "dependency": "transitive", + "description": { + "name": "sliver_tools", + "sha256": "eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.12" + }, + "smtc_windows": { + "dependency": "direct main", + "description": { + "name": "smtc_windows", + "sha256": "799bbe0f8e4436da852c5dcc0be482c97b8ae0f504f65c6b750cd239b4835aa0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.4" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "split_view": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "8b2b0f0e1c8470183cb2df40815a05bfdb3fe219", + "resolved-ref": "8b2b0f0e1c8470183cb2df40815a05bfdb3fe219", + "url": "https://github.com/odriverobotics/split_view.git" + }, + "source": "git", + "version": "3.2.1" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3+1" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "time": { + "dependency": "transitive", + "description": { + "name": "time", + "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.6" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "value_layout_builder": { + "dependency": "transitive", + "description": { + "name": "value_layout_builder", + "sha256": "98202ec1807e94ac72725b7f0d15027afde513c55c69ff3f41bcfccb950831bc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "weak_map": { + "dependency": "transitive", + "description": { + "name": "weak_map", + "sha256": "95ca338f0cdf5f0022cc283dfa4d97f6f6b03752f67eca85ebe6d7a679ffe3ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.1" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.9" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "xxh3": { + "dependency": "transitive", + "description": { + "name": "xxh3", + "sha256": "a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.4.0 <4.0.0", + "flutter": ">=3.19.0" + } +} diff --git a/pkgs/by-name/fi/fixjson/package.nix b/pkgs/by-name/fi/fixjson/package.nix new file mode 100644 index 0000000000000..52ed03c690f5f --- /dev/null +++ b/pkgs/by-name/fi/fixjson/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub +}: + +buildNpmPackage { + pname = "fixjson"; + version = "1.1.2-unstable-2021-01-05"; + + src = fetchFromGitHub { + owner = "rhysd"; + repo = "fixjson"; + # Upstream has no tagged releases, but this commit bumps version + rev = "d0483f9cc59896ea59bb16f906f770562d332000"; + hash = "sha256-Mu7ho0t5GzFYuBK6FEXhpsaRxn9HF3lnvMxRpg0aqYI="; + }; + + npmDepsHash = "sha256-tnsgNtMdnrKYxcYy9+4tgp1BX+o8e5/HUDeSP5BOvUQ="; + + meta = { + description = "JSON Fixer for Humans using (relaxed) JSON5"; + homepage = "https://github.com/rhysd/fixjson"; + license = lib.licenses.mit; + mainProgram = "fixjson"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 09c3215527f86..8594591ae1b85 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-KJTObuHJQjIgg/5A25Ee+7s2SrmtyYFnvcnklYhSCNE="; + hash = "sha256-Oq+HZzB0mWhixLl8jGcBRWrlOETLhath75ndeJdcN1g="; }; - cargoHash = "sha256-ADqc7H2MClXyYEw/lc9F4HAfpHrDc/lqL/BIL/PTZro="; + cargoHash = "sha256-/Y3ihHwOHHmLnS1TcG1SCtUU4LORkCtGp1+t5Ow5j6E="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix index 0cfc68aa4fd2b..83fba770c113e 100644 --- a/pkgs/by-name/fo/font-manager/package.nix +++ b/pkgs/by-name/fo/font-manager/package.nix @@ -14,7 +14,7 @@ , vala , gsettings-desktop-schemas , gtk3 -, gnome +, adwaita-icon-theme , desktop-file-utils , nix-update-script , wrapGAppsHook3 @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sqlite gsettings-desktop-schemas # for font settings gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load libsoup diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index cd8853b95f0d3..8f569f610243c 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fooyin"; - version = "0.4.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ludouzi"; repo = "fooyin"; rev = "v" + finalAttrs.version; - hash = "sha256-hrPbJnN4Ooq5unA9VbX0UjRZQjPz93X/IQdBSfTUIGk="; + hash = "sha256-OgO0o3OaL/1MOgpi5QIDzVQI8eM0zPgPVLWzICMgV7w="; }; buildInputs = [ diff --git a/pkgs/by-name/fr/freecell-solver/package.nix b/pkgs/by-name/fr/freecell-solver/package.nix index 1cb06e59636fa..c7a1dc5f2a4aa 100644 --- a/pkgs/by-name/fr/freecell-solver/package.nix +++ b/pkgs/by-name/fr/freecell-solver/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "freecell-solver"; - version = "6.10.0"; + version = "6.12.0"; src = fetchurl { url = "https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-${finalAttrs.version}.tar.xz"; - hash = "sha256-RDuineCL51GmD6ykKoF7ZbNCzqkxiP12UXQbdQSDebQ="; + hash = "sha256-oriegEzkuRjvdJAxZ2IQ8glf6jqMsSmAVgKEPHxIhKA="; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 48aaa97f8b7e8..2498dc45b5ee0 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -5,7 +5,7 @@ let pname = "gate"; - version = "0.37.1"; + version = "0.38.0"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "minekube"; repo = "gate"; rev = "refs/tags/v${version}"; - hash = "sha256-2oWC6l6SFrulk0EPLVtFfMKfVPHZFOngKjvOLprg/Yk="; + hash = "sha256-kiVyrmAXRDreGIBq9bJhscULjbPgoDVv8kw9APJ5TQk="; }; vendorHash = "sha256-JaBcGcqFqp9Il3FyU/QwThuggzPg8HWScvFHEAgtgBU="; diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/by-name/ge/geary/package.nix index 461402dda8b3d..565ed9ae2d239 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/by-name/ge/geary/package.nix @@ -143,7 +143,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/by-name/gh/ghex/package.nix index f58ca108e9056..0f3aefaa56bed 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "ghex"; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/by-name/gi/git-fixup/package.nix b/pkgs/by-name/gi/git-fixup/package.nix new file mode 100644 index 0000000000000..af975e6e54ae3 --- /dev/null +++ b/pkgs/by-name/gi/git-fixup/package.nix @@ -0,0 +1,42 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, git, coreutils, gnused, gnugrep }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "git-fixup"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "keis"; + repo = "git-fixup"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-Mue2xgYxJSEu0VoDmB7rnoSuzyT038xzETUO1fwptrs="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + installFlags = [ + "install" + "install-fish" + "install-zsh" + ]; + + postInstall = '' + wrapProgram $out/bin/git-fixup \ + --prefix PATH : "${lib.makeBinPath [ git coreutils gnused gnugrep ]}" + ''; + + meta = { + description = "Fighting the copy-paste element of your rebase workflow"; + homepage = "https://github.com/keis/git-fixup"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ michaeladler ]; + platforms = lib.platforms.all; + mainProgram = "git-fixup"; + }; +}) diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index 84f1709f304a7..74355827f2b4e 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -13,7 +13,7 @@ let maintainers ; - version = "0.2.5"; + version = "0.2.7"; in rustPlatform.buildRustPackage { pname = "git-instafix"; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage { owner = "quodlibetor"; repo = "git-instafix"; rev = "v${version}"; - hash = "sha256-tizA5BLZZ/9gfHv2X8is7EJD1reMvfA7c6JETUoUgvI="; + hash = "sha256-Uz+KQ8cQT3v97EtmbAv2II30dUrFD0hMo/GhnqcdBOs="; }; - cargoHash = "sha256-kIIwswj8mfpY382O0bdMoSk6+T+614l2QCeRgz3ZxEY="; + cargoHash = "sha256-12UkZyyu4KH3dcCadr8UhK8DTtVjcsjYzt7kiNLpUqU="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-run/package.nix b/pkgs/by-name/gi/git-run/package.nix new file mode 100644 index 0000000000000..a9f257b24bc66 --- /dev/null +++ b/pkgs/by-name/gi/git-run/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "git-run"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "mixu"; + repo = "gr"; + rev = "v${version}"; + hash = "sha256-WPnar87p0GYf6ehhVEUeZd2pTjS95Zl6NpiJuIOQ5Tc="; + }; + + npmDepsHash = "sha256-PdxKFopmuNRWkSwPDX1wcNTvRtbVScl1WsZi7sdkKMw="; + + makeCacheWritable = true; + dontBuild = true; + + meta = { + description = "Multiple git repository management tool"; + homepage = "https://mixu.net/gr/"; + license = lib.licenses.bsd3; + mainProgram = "gr"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/by-name/gi/gitg/package.nix index 923f1ccc28bfd..923f1ccc28bfd 100644 --- a/pkgs/desktops/gnome/misc/gitg/default.nix +++ b/pkgs/by-name/gi/gitg/package.nix diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index ae882fdfddaff..606a7770dc2f3 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -4,7 +4,7 @@ , autoPatchelfHook , wrapGAppsHook3 , makeWrapper -, gnome +, gnome-keyring , libsecret , git , curl @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; buildInputs = [ - gnome.gnome-keyring + gnome-keyring xorg.libXdamage xorg.libX11 libsecret diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 027036915a5b2..0be8da2880ab1 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.51.0"; + version = "4.52.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-D1zviTj7isAuEyzRYEyjq4sx+jo/U3ZQZLFr35/1ZNo="; + hash = "sha256-qNrZInSLb7IA8YTRPKlTWJ42uavrNTV5A62twwjuOag="; }; - npmDepsHash = "sha256-ocrSOPLbWkU0LBpWAdl54hWr+7gE3z2sy8lJilGsExo="; + npmDepsHash = "sha256-3Teow+CyUB6LrkSuOs1YYsdrxsorgJnU2g6k3XBL9S0="; postPatch = '' # remove cleanup which runs git commands diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix new file mode 100644 index 0000000000000..076eeb295d99d --- /dev/null +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, +}: + +rustPlatform.buildRustPackage rec { + pname = "glrnvim"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "beeender"; + repo = "glrnvim"; + rev = "v${version}"; + sha256 = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; + }; + + cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + DiskArbitration + Foundation + ]); + + postInstall = '' + install -Dm644 glrnvim.desktop -t $out/share/applications + install -Dm644 glrnvim.svg $out/share/icons/hicolor/scalable/apps/glrnvim.svg + ''; + + meta = { + description = "Really fast & stable neovim GUI which could be accelerated by GPU"; + homepage = "https://github.com/beeender/glrnvim"; + mainProgram = "glrnvim"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aacebedo ]; + }; +} diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 9c3d74cbe566c..5d097f13f5c62 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (variants.${variant}) description; license = lib.licenses.gpl3Plus; mainProgram = "gmic_qt"; - maintainers = with lib.maintainers; [ AndersonTorres lilyinstarlight ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix index 1ed7224ac5d6c..824db435e2498 100644 --- a/pkgs/by-name/gm/gmic/package.nix +++ b/pkgs/by-name/gm/gmic/package.nix @@ -111,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.cecill21; maintainers = [ lib.maintainers.AndersonTorres - lib.maintainers.lilyinstarlight ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/by-name/gn/gnome-autoar/package.nix index 8d1adac088e88..dfbcc24898b5a 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/by-name/gn/gnome-autoar/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-autoar"; - attrPath = "gnome.gnome-autoar"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/by-name/gn/gnome-calculator/package.nix index 3b666976681e2..577a8245426a6 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/by-name/gn/gnome-calculator/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-calculator"; - attrPath = "gnome.gnome-calculator"; }; }; diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/by-name/gn/gnome-calendar/package.nix index d56c8114bd041..a751ee3822718 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/by-name/gn/gnome-calendar/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-common/default.nix b/pkgs/by-name/gn/gnome-common/package.nix index a9d28fcd4cfce..0f9a1269b6ba9 100644 --- a/pkgs/desktops/gnome/core/gnome-common/default.nix +++ b/pkgs/by-name/gn/gnome-common/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; }; + updateScript = gnome.updateScript { packageName = "gnome-common"; }; }; propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix index 0fed6638f97e7..9db61b591eb74 100644 --- a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/pkgs/by-name/gn/gnome-dictionary/package.nix @@ -15,6 +15,7 @@ , docbook_xsl , docbook_xml_dtd_43 , gnome +, adwaita-icon-theme , gtk3 , glib , gsettings-desktop-schemas @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { gtk3 glib gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; doCheck = true; @@ -71,7 +72,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-dictionary"; - attrPath = "gnome.gnome-dictionary"; }; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/Archive/gnome-dictionary"; description = "Dictionary is the GNOME application to look up definitions"; mainProgram = "gnome-dictionary"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix index 536e71f630ee9..4ca25e2cf822f 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix @@ -15,6 +15,7 @@ , libnotify , itstool , gnome +, adwaita-icon-theme , libxml2 , gsettings-desktop-schemas , libcanberra-gtk3 @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { libdvdread libcanberra-gtk3 udisks2 - gnome.adwaita-icon-theme + adwaita-icon-theme systemd gnome.gnome-settings-daemon gsettings-desktop-schemas @@ -66,7 +67,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-disk-utility"; - attrPath = "gnome.gnome-disk-utility"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index 5a0f8d82cb535..ddb98b787099c 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; - attrPath = "gnome.gnome-font-viewer"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/by-name/gn/gnome-keyring/package.nix index d8a455b0b9faa..01be1e7aa9000 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/by-name/gn/gnome-keyring/package.nix @@ -95,7 +95,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-keyring"; - attrPath = "gnome.gnome-keyring"; }; }; diff --git a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix b/pkgs/by-name/gn/gnome-packagekit/package.nix index 6e2f9168e54f0..699e24fba18e3 100644 --- a/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix +++ b/pkgs/by-name/gn/gnome-packagekit/package.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-packagekit"; - attrPath = "gnome.gnome-packagekit"; }; }; diff --git a/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch b/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch index 0750d01f86757..0750d01f86757 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/fix-schema-path.patch +++ b/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index 4261ebaec1efd..4261ebaec1efd 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix diff --git a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix b/pkgs/by-name/gn/gnome-screenshot/package.nix index b8fa9a9f0c29e..e282277469f02 100644 --- a/pkgs/desktops/gnome/core/gnome-screenshot/default.nix +++ b/pkgs/by-name/gn/gnome-screenshot/package.nix @@ -16,6 +16,7 @@ , appstream-glib , desktop-file-utils , gnome +, adwaita-icon-theme , gsettings-desktop-schemas }: @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { glib libcanberra-gtk3 libhandy - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas ]; @@ -68,7 +69,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch b/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch index 967ef5e155421..967ef5e155421 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch +++ b/pkgs/by-name/gn/gnome-system-monitor/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix index bc7caa3ad27b5..27c4576e01709 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix @@ -15,6 +15,7 @@ , gsettings-desktop-schemas , itstool , gnome +, adwaita-icon-theme , librsvg , gdk-pixbuf , libgtop @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { gtkmm4 libgtop gdk-pixbuf - gnome.adwaita-icon-theme + adwaita-icon-theme librsvg gsettings-desktop-schemas systemd @@ -65,7 +66,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-system-monitor"; - attrPath = "gnome.gnome-system-monitor"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/by-name/gn/gnome-terminal/package.nix index 7cfde6e911ae2..7cfde6e911ae2 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/by-name/gn/gnome-terminal/package.nix diff --git a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix b/pkgs/by-name/gn/gnome-themes-extra/package.nix index 52aededca0fe6..c40c81b8245f7 100644 --- a/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix +++ b/pkgs/by-name/gn/gnome-themes-extra/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome, librsvg, pkg-config, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome, adwaita-icon-theme, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool gtk3 ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; - propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ adwaita-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index a145e9e2d8e3b..3bbe91007b6d8 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -80,7 +80,6 @@ python3Packages.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index a9f14ba0437b3..1d2368478bb1c 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gnome-user-share"; - attrPath = "gnome.gnome-user-share"; }; }; diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 204fa79b1f3cc..65f845a4dd4d0 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.13"; + version = "2.5.1"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nrkc+uYgPES3CfRjmfH/9eM6NL8Vo3kUBX9JHEw/1C4="; + sha256 = "sha256-xNdikp3Kd/VAzn7QjqIrNvifFI0mMTJ5U+zk+QbJAk0="; }; - vendorHash = "sha256-iyZNOooPH1jvT+S9/ETRoXsTwXUIUi1UKmDzhB7NRuE="; + vendorHash = "sha256-xN0FJntfQ2V2IsxD8dEi0vR+psnjGR7G6+ssxNTuzc4="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 15b444728b26e..9f7a1d8281a81 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -32,7 +32,7 @@ , pulseSupport ? true, libpulseaudio , gsettings-desktop-schemas -, gnome +, adwaita-icon-theme # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) , libvaSupport ? true, libva @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "google-chrome"; - version = "126.0.6478.114"; + version = "126.0.6478.126"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-CGqo6XnUwndOjODOxy+TCGxDXbAz4EwkZMOl7ZLFsAc="; + hash = "sha256-PsHK27Vc9mzFHwQh6s4ySoiDbuLZgrlFuPZ6PxMbCSQ="; }; nativeBuildInputs = [ patchelf makeWrapper ]; @@ -77,7 +77,7 @@ in stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch b/pkgs/by-name/gp/gpaste/fix-paths.patch index ebebc8a20bd66..ebebc8a20bd66 100644 --- a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch +++ b/pkgs/by-name/gp/gpaste/fix-paths.patch diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/by-name/gp/gpaste/package.nix index 16da276b64b55..16da276b64b55 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/by-name/gp/gpaste/package.nix diff --git a/pkgs/desktops/gnome/misc/gpaste/wrapper.js b/pkgs/by-name/gp/gpaste/wrapper.js index ea6a9cba6f6fb..ea6a9cba6f6fb 100644 --- a/pkgs/desktops/gnome/misc/gpaste/wrapper.js +++ b/pkgs/by-name/gp/gpaste/wrapper.js diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index fbf652297a25e..60a6e05de211b 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -47,12 +47,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl.dev - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - libcublas.dev - libcublas.lib + cuda_cccl + cuda_cudart + libcublas ]); cmakeFlags = [ diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 588e0e45d911f..c31195ff23316 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.79.1"; + version = "0.79.2"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-Ih1xja20e3wCZ68kRA9bK8jh+pw/5KtlgeE3dDjqeE0="; + hash = "sha256-8GO5vMUl6b1qjQ9+FdieLkSvkMQuJBwrfhJJies/37U="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-iSpSJwAHB/HJ3Ut1VgUBd1yCwOaM4f3ihR0J4YjMVxM="; + vendorHash = "sha256-nws+/haDtyVC80f3S0wM7zI8ZB7c7KalqV96mp2D4C8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/by-name/gu/gucharmap/package.nix index 17f8465f380bf..17f8465f380bf 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/by-name/gu/gucharmap/package.nix diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix index ca585ce03bed1..7b8db4c7c3c2b 100644 --- a/pkgs/by-name/he/hello/package.nix +++ b/pkgs/by-name/he/hello/package.nix @@ -4,6 +4,7 @@ , fetchurl , nixos , testers +, versionCheckHook , hello }: @@ -19,6 +20,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; # Give hello some install checks for testing purpose. postInstallCheck = '' diff --git a/pkgs/by-name/hi/hidviz/package.nix b/pkgs/by-name/hi/hidviz/package.nix index 5aeba2f5b082a..52e1b8a586b72 100644 --- a/pkgs/by-name/hi/hidviz/package.nix +++ b/pkgs/by-name/hi/hidviz/package.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "GUI application for in-depth analysis of USB HID class devices"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nayala ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix index 14ab9fddb66fe..2fc2441314156 100644 --- a/pkgs/by-name/hi/highs/package.nix +++ b/pkgs/by-name/hi/highs/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highs"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "ERGO-Code"; repo = "HiGHS"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-SJbS0403HyiW8zPrLsNWp8+h/wL7UdrS+QOEjLf1jzE="; + sha256 = "sha256-q18TfKbZyTZzzPZ8z3U57Yt8q2PSvbkg3qqqiPMgy5Q="; }; strictDeps = true; diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index cedbe645f9416..9cffed873290d 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -6,7 +6,7 @@ , stdenv , darwin , coreutils -, gnome +, gnome-keyring , libsecret , bash , openvpn @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ - gnome.gnome-keyring + gnome-keyring ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/ht/htcondor/package.nix b/pkgs/by-name/ht/htcondor/package.nix index 3d382f0c0a712..c9bfb20a3a19a 100644 --- a/pkgs/by-name/ht/htcondor/package.nix +++ b/pkgs/by-name/ht/htcondor/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "htcondor"; - version = "23.7.2"; + version = "23.8.1"; src = fetchFromGitHub { owner = "htcondor"; repo = "htcondor"; rev = "v${version}"; - hash = "sha256-U0IeZlDd21RYR9XNoIGPpuwhEL1MfQ9+DDyeX8sLgWM="; + hash = "sha256-ccrc3ykhZQc2ExFKgwk3g5ivqh/fLTM7T9nz2YTMx3Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 3bbd7678c0062..3cebfa3aa0c34 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.128.0"; + version = "0.128.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-dyiCEWOiUtRppKgpqI68kC7Hv1AMK76kvCEaS8nIIJM="; + hash = "sha256-vSszDPyRvaWpf7m27R4rbS1R7z4vk3hHzn3I0siijTE="; }; vendorHash = "sha256-iNI/5uAYMG+bfndpD17dp1v3rGbFdHnG9oQv/grb/XY="; diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix index 4bf253c030f7d..8f89a00810620 100644 --- a/pkgs/by-name/hy/hyperlink/package.nix +++ b/pkgs/by-name/hy/hyperlink/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { description = "Very fast link checker for CI"; homepage = "https://github.com/untitaker/hyperlink"; license = licenses.mit; - maintainers = [ maintainers.rossabaker ]; + maintainers = [ ]; mainProgram = "hyperlink"; }; } diff --git a/pkgs/by-name/hy/hyperspeedcube/Cargo.lock b/pkgs/by-name/hy/hyperspeedcube/Cargo.lock index 2e8dfdac706b2..b46dcd303c985 100644 --- a/pkgs/by-name/hy/hyperspeedcube/Cargo.lock +++ b/pkgs/by-name/hy/hyperspeedcube/Cargo.lock @@ -1434,7 +1434,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyperspeedcube" -version = "1.0.6" +version = "1.0.7" dependencies = [ "ambassador", "anyhow", diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix index 5b5c53b7708f8..79cb640ce0383 100644 --- a/pkgs/by-name/hy/hyperspeedcube/package.nix +++ b/pkgs/by-name/hy/hyperspeedcube/package.nix @@ -41,13 +41,13 @@ rustPlatform.buildRustPackage rec { pname = "hyperspeedcube"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "HactarCE"; repo = "Hyperspeedcube"; rev = "v${version}"; - hash = "sha256-FcQuXxVxiyI4hOKS70m62BtZMfN5FzGTLagS+2B3WdY="; + hash = "sha256-ykFf0dfc8j88Y25tx+G9lic09eHDz3WR+h6+owTeWbU="; }; cargoLock = { diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index b322e6f0f366a..0ae303747bfe5 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "impala"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "pythops"; repo = "impala"; rev = "v${version}"; - hash = "sha256-7UMHkm3AtPqUILrsUnM0SbZT4Sq55dEElMN0KonjwtE="; + hash = "sha256-0ULcknkZKYEvuqlcY8E1kZtpA0lPxxjRV2/zfak+FKU="; }; - cargoHash = "sha256-CtEirsSQAg2Fv44YoKKmSjQs85++QWFRcWoA4VrBbgU="; + cargoHash = "sha256-1jFUfpinqXBu8eTFAA1dRDk1F1IhNjcA7CkJmaIjkFQ="; meta = { description = "TUI for managing wifi"; diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index b39b6b8fdbf17..3e266bd1e446e 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-+q5qP7w2RdtuwvxPThCryYYEJ7s5WDnWHRvjo4TuajA="; - version = "6.0.0"; - vendorHash = "sha256-wcauzIbBcYpSWttZCVVE9m49AEQGolGYSsv9eEkhb7Y="; + hash = "sha256-8GgzMiXn/78HkMuJ49cQA9BEQVAzPbG7jOxTScByR6Q="; + version = "6.0.1"; + vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; patches = [ ]; lts = true; updateScriptArgs = "--lts=true --regex '6.0.*'"; diff --git a/pkgs/by-name/in/inotify-info/package.nix b/pkgs/by-name/in/inotify-info/package.nix index 6edae9b3f5402..21de48577df68 100644 --- a/pkgs/by-name/in/inotify-info/package.nix +++ b/pkgs/by-name/in/inotify-info/package.nix @@ -5,22 +5,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "inotify-info"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "mikesart"; repo = "inotify-info"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-6EY2cyFWfMy1hPDdDGwIzSE92VkAPo0p5ZCG+B1wVYY="; + hash = "sha256-mxZpJMmSCgm5uV5/wknVb1PdxRIF/b2k+6rdOh4b8zA="; }; buildFlags = ["INOTIFYINFO_VERSION=v${finalAttrs.version}"]; - installPhase = '' - runHook preInstall - install -Dm755 _release/inotify-info $out/bin/inotify-info - runHook postInstall - ''; + installFlags = ["PREFIX=$$out"]; meta = with lib; { description = "Easily track down the number of inotify watches, instances, and which files are being watched"; diff --git a/pkgs/by-name/in/insync-nautilus/package.nix b/pkgs/by-name/in/insync-nautilus/package.nix index 8cf010c893264..d0e3b3d934e48 100644 --- a/pkgs/by-name/in/insync-nautilus/package.nix +++ b/pkgs/by-name/in/insync-nautilus/package.nix @@ -3,7 +3,7 @@ fetchurl, lib, dpkg, - gnome, + nautilus-python, insync-emblem-icons, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ dpkg ]; buildInputs = [ - gnome.nautilus-python + nautilus-python insync-emblem-icons ]; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 48b945c833c35..945efaec3c190 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2404.25-jammy"; + version = "1.2405.17-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-ZRJdhhDwXeOjIx7Ml4VvPUOotnJQ9f73nsYzgm6SQC8="; + hash = "sha256-WpVPWzh8jN092MaY2rMXhLfpVXsflMl9hOY9nNGJlLk="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/ip/ipam/package.nix b/pkgs/by-name/ip/ipam/package.nix index 987b82d03e053..3f5aa2ea78f27 100644 --- a/pkgs/by-name/ip/ipam/package.nix +++ b/pkgs/by-name/ip/ipam/package.nix @@ -36,7 +36,7 @@ buildGoModule rec { homepage = "https://ipam.lauka.net/"; changelog = "https://codeberg.org/lauralani/ipam/releases/tag/v${version}"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "ipam"; }; } diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 006eb004611d2..bc1f877af11bf 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -10,7 +10,7 @@ gsettings-desktop-schemas, wrapGAppsHook3, gtk-layer-shell, - gnome, + adwaita-icon-theme, libxkbcommon, openssl, pkg-config, @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { gtk-layer-shell glib-networking shared-mime-info - gnome.adwaita-icon-theme + adwaita-icon-theme hicolor-icon-theme gsettings-desktop-schemas libxkbcommon diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index 3f5337f04cf13..4b156fe0b710f 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -1,23 +1,21 @@ -{ lib -, stdenvNoCC -, fetchzip -, fetchFromGitHub -, butler -, electron -, steam-run -, makeWrapper -, copyDesktopItems -, makeDesktopItem +{ + lib, + stdenvNoCC, + fetchzip, + fetchFromGitHub, + electron, + steam-run, + makeWrapper, + copyDesktopItems, + makeDesktopItem, }: -stdenvNoCC.mkDerivation rec { - pname = "itch"; - version = "26.1.3"; - # TODO: Using kitch instead of itch, revert when possible - src = fetchzip { - url = "https://broth.itch.ovh/kitch/linux-amd64/${version}/archive/default#.zip"; +let + version = "26.1.9"; + butler = fetchzip { + url = "https://broth.itch.zone/butler/linux-amd64/15.21.0/butler.zip"; stripRoot = false; - hash = "sha256-FHwbzLPMzIpyg6KyYTq6/rSNRH76dytwb9D5f9vNKkU="; + hash = "sha256-jHni/5qf7xST6RRonP2EW8fJ6647jobzrnHe8VMx4IA="; }; itch-setup = fetchzip { @@ -26,16 +24,31 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; }; - icons = let sparseCheckout = "/release/images/itch-icons"; in + sparseCheckout = "/release/images/itch-icons"; + icons = fetchFromGitHub { - owner = "itchio"; - repo = "itch"; - rev = "v${version}-canary"; - hash = "sha256-0AMyDZ5oI7/pSvudoEqXnMZJtpcKVlUSR6YVm+s4xv0="; - sparseCheckout = [ sparseCheckout ]; - } + sparseCheckout; + owner = "itchio"; + repo = "itch"; + rev = "v${version}"; + hash = "sha256-jugg+hdP0y0OkFhdQuEI9neWDuNf2p3+DQuwxe09Zck="; + sparseCheckout = [ sparseCheckout ]; + } + + sparseCheckout; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "itch"; + inherit version; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + src = fetchzip { + url = "https://broth.itch.ovh/itch/linux-amd64/${finalAttrs.version}/archive/default#.zip"; + stripRoot = false; + hash = "sha256-4k6afBgOKGs7rzXAtIBpmuQeeT/Va8/0bZgNYjuJhgI="; + }; + + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; desktopItems = [ (makeDesktopItem { @@ -44,7 +57,10 @@ stdenvNoCC.mkDerivation rec { tryExec = "itch"; icon = "itch"; desktopName = "itch"; - mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; + mimeTypes = [ + "x-scheme-handler/itchio" + "x-scheme-handler/itch" + ]; comment = "Install and play itch.io games easily"; categories = [ "Game" ]; }) @@ -54,19 +70,15 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - # TODO: Remove when the next stable Itch is stabilized - substituteInPlace ./resources/app/package.json \ - --replace "kitch" "itch" - mkdir -p $out/bin $out/share/itch/resources/app cp -r resources/app "$out/share/itch/resources/" install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" - for icon in $icons/icon*.png + for icon in ${icons}/icon*.png do - iconsize="''${icon#$icons/icon}" + iconsize="''${icon#${icons}/icon}" iconsize="''${iconsize%.png}" icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" install -Dm644 "$icon" "$icondir/itch.png" @@ -80,16 +92,16 @@ stdenvNoCC.mkDerivation rec { --add-flags ${electron}/bin/electron \ --add-flags $out/share/itch/resources/app \ --set BROTH_USE_LOCAL butler,itch-setup \ - --prefix PATH : ${butler}/bin/:${itch-setup} + --prefix PATH : ${butler}:${itch-setup} ''; - meta = with lib; { + meta = { description = "Best way to play itch.io games"; homepage = "https://github.com/itchio/itch"; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; - maintainers = with maintainers; [ pasqui23 ]; + maintainers = with lib.maintainers; [ pasqui23 ]; mainProgram = "itch"; }; -} +}) diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/by-name/ke/keymapp/package.nix index 59dae9589fa7a..c2777ce5c8e56 100644 --- a/pkgs/applications/misc/keymapp/default.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -1,44 +1,48 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook3 -, libusb1 -, webkitgtk -, gtk3 -, writeShellScript -, makeDesktopItem -, copyDesktopItems +{ + stdenv, + lib, + fetchurl, + autoPatchelfHook, + wrapGAppsHook4, + libusb1, + libsoup_3, + webkitgtk_4_1, + writeShellScript, + makeDesktopItem, + copyDesktopItems, }: let desktopItem = makeDesktopItem { name = "keymapp"; icon = "keymapp"; desktopName = "Keymapp"; - categories = [ "Settings" "HardwareSettings" ]; + categories = [ + "Settings" + "HardwareSettings" + ]; type = "Application"; exec = "keymapp"; }; in stdenv.mkDerivation rec { pname = "keymapp"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls="; + hash = "sha256-WiazQD40dG72B9tl4DwcMJgoVEl/Dgq55AHgeqK+sq8="; }; nativeBuildInputs = [ copyDesktopItems autoPatchelfHook - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ libusb1 - webkitgtk - gtk3 + webkitgtk_4_1 + libsoup_3 ]; sourceRoot = "."; @@ -61,7 +65,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zsa.io/flash/"; description = "Application for ZSA keyboards"; - maintainers = with lib.maintainers; [ jankaifer shawn8901 ]; + maintainers = with lib.maintainers; [ + jankaifer + shawn8901 + ]; platforms = platforms.linux; license = lib.licenses.unfree; }; diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix index bc9fdf70d9e54..8d46aadef5cf4 100644 --- a/pkgs/by-name/ko/kooha/package.nix +++ b/pkgs/by-name/ko/kooha/package.nix @@ -22,19 +22,19 @@ stdenv.mkDerivation rec { pname = "kooha"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - hash = "sha256-D/+tsIfcXrlwwL6vSLRsiAp7wMVtIgzjNNd2uk+9bco="; + hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-iDyhK2k2RB7CvtW+91isVzIFOl2/Loh+Bvneu4TGfn0="; + hash = "sha256-m5y/VfjTJgK+/ZjsMo/9zPVxcV3kuwXb+HNdXR6hkV4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index 9a8863a303445..b5bc0d1608cf1 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kor"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-mGHSfOW40NTFK1csckSNriCYF2bEQD/M1Zs34i3PptI="; + hash = "sha256-iwulXSS6nRwoQUPkQMkBbgJM0ityrGx1T+1s1la/lnM="; }; vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc="; diff --git a/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/pkgs/by-name/ky/kyverno-chainsaw/package.nix index 411df5eee29d2..bde16f3d6b33c 100644 --- a/pkgs/by-name/ky/kyverno-chainsaw/package.nix +++ b/pkgs/by-name/ky/kyverno-chainsaw/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kyverno-chainsaw"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "chainsaw"; rev = "v${version}"; - hash = "sha256-YMUT1Wz/jDLH8eMYtfevdww/X+jdM9KqHjUCMSCRRXM="; + hash = "sha256-XkHXjRPthWPFr1t66DGeM5rQHqQEObEO5MhveClBmxg="; }; - vendorHash = "sha256-R2+HjziP0KtExYQ3ZPGZKkqfKinK3BBnxJJh454ed2w="; + vendorHash = "sha256-/W9tLNomE5sQb4NqZ4XCrNY+w6GbKblOhd9MilqLY50="; ldflags = [ "-s" "-w" diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix new file mode 100644 index 0000000000000..d039cad84201e --- /dev/null +++ b/pkgs/by-name/li/libetebase/package.nix @@ -0,0 +1,45 @@ +{ rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, lib +, stdenv +, testers +, libetebase +}: +rustPlatform.buildRustPackage rec { + pname = "libetebase"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "etesync"; + repo = "libetebase"; + rev = "v${version}"; + hash = "sha256-cXuOKfyMdk+YzDi0G8i44dyBRf4Ez5+AlCKG43BTSSU="; + }; + + cargoHash = "sha256-GUNj5GrY04CXnej3WDKZmW4EeJhoCl2blHSDfEkQKtE="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + postInstall = '' + install -d $out/lib/pkgconfig + sed s#@prefix@#$out#g etebase.pc.in > $out/lib/pkgconfig/etebase.pc + install -Dm644 EtebaseConfig.cmake -t $out/lib/cmake/Etebase + install -Dm644 target/etebase.h -t $out/include/etebase + ln -s $out/lib/libetebase.so $out/lib/libetebase.so.0 + ''; + + passthru.tests.pkgs-config = testers.testMetaPkgConfig libetebase; + + meta = with lib; { + description = "A C library for Etebase"; + homepage = "https://www.etebase.com/"; + license = licenses.bsd3; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ laalsaas ]; + pkgConfigModules = [ "etebase" ]; + }; +} diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/by-name/li/libgnome-keyring/package.nix index 912953dfb33f6..e845970a6ad7d 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/by-name/li/libgnome-keyring/package.nix @@ -13,9 +13,23 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; + strictDeps = true; propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + configureFlags = [ + # not ideal to use -config scripts but it's not possible switch it to pkg-config + # binaries in dev have a for build shebang + "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" + ]; + + postPatch = '' + # uses pkg-config in some places and uses the correct $PKG_CONFIG in some + # it's an ancient library so it has very old configure scripts and m4 + substituteInPlace ./configure \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { diff --git a/pkgs/by-name/li/libisocodes/package.nix b/pkgs/by-name/li/libisocodes/package.nix new file mode 100644 index 0000000000000..4b4d4003d833e --- /dev/null +++ b/pkgs/by-name/li/libisocodes/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitHub, + vala, + pkg-config, + gobject-introspection, + libxml2, + libgee, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libisocodes"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "toddy15"; + repo = "libisocodes"; + rev = "v${finalAttrs.version}"; + hash = "sha256-a2gVqiZXDiH1byEw/s3MqDQBBZ/bmnw8OyllGYfYykQ="; + }; + + nativeBuildInputs = [ + vala + pkg-config + gobject-introspection + ]; + + buildInputs = [ + libxml2 + libgee + ]; + + meta = { + description = "Easily access XML data of the iso-codes package"; + longDescription = '' + This library can be used to easily access XML data of + the iso-codes package. It will provide an abstraction + layer to handle both the version 3 and the upcoming + version 4 of iso-codes. Moreover, all available + translations can be used as well. + + This library makes use of the GObject introspection + features, so that it is accessible from a variety of + programming languages, for example C, Vala, Ruby, + Python, Perl, Lua, JavaScript, PHP and many more. + ''; + homepage = "https://github.com/toddy15/libisocodes"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index 931c24ad28d4f..4f433e9b6f146 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "24.05"; + version = "24.06"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-sU95EEsdDXjen7QoBfKdVP3wHD5Ckcw2OOBNCdFFuNY="; + hash = "sha256-BoPyiiR13CQXIFulKN68zEB9pNn6ZRbrS3Wz/3JE6W4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/li/libzim-glib/package.nix b/pkgs/by-name/li/libzim-glib/package.nix new file mode 100644 index 0000000000000..39894323c227f --- /dev/null +++ b/pkgs/by-name/li/libzim-glib/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + vala, + pkg-config, + gobject-introspection, + glib, + zimlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libzim-glib"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "birros"; + repo = "libzim-glib"; + rev = "v${finalAttrs.version}"; + hash = "sha256-C1f/ULTJIHvt/LCSRw3dsGAWUkb1i4xaCmW1+QBZd2c="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gobject-introspection + ]; + + buildInputs = [ + glib + zimlib + ]; + + # requires downloading test sample of a specific zimlib version + doCheck = false; + + meta = { + description = "Partial GObject/C bindings for libzim"; + homepage = "https://github.com/birros/libzim-glib"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 4402cad9816ab..eade9bd2d6316 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.8.0"; + version = "7.9.1"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-Fue2KPyJ76Q1f+chvhwmJlmQ4QwXksyCeztd2d2cTH0="; + sha256 = "sha256-cR6ilV5giwvbqUoOGbnXQnqZzUz/oL7OGZPYNoFKvy0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix index fe276c14c3434..777d71a987d20 100644 --- a/pkgs/by-name/li/livekit-cli/package.nix +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit-cli"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit-cli"; rev = "v${version}"; - hash = "sha256-IARQ5yxktem729SrxdT5i+7+1dY60xw+2KZU+unlsKM="; + hash = "sha256-J5tg3nm2pEemEZcIpObcxH+G4ByzvUtoSyy92CcWr6M="; }; - vendorHash = "sha256-3ePOwEEPexM+k0atW/mW4yNVtnsEXwv1w5NVQLyexbs="; + vendorHash = "sha256-ywHTIuiZaoY3p7hTsnImcCpuwMXHQZcnRsWerIlOU4o="; subPackages = [ "cmd/livekit-cli" ]; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 254f8c2a51f6f..e1f14a4b31eb5 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -46,16 +46,12 @@ let ++ optionals metalSupport [ MetalKit ]; cudaBuildInputs = with cudaPackages; [ - cuda_cccl.dev # <nv/target> + cuda_cccl # <nv/target> # A temporary hack for reducing the closure size, remove once cudaPackages # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - libcublas.dev - libcublas.lib - libcublas.static + cuda_cudart + libcublas ]; rocmBuildInputs = with rocmPackages; [ @@ -71,13 +67,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "3091"; + version = "3260"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-ppujag6Nrk/M9QMQ4mYe2iADsfKzmfKtOP8Ib7GZBmk="; + hash = "sha256-0KVwSzxfGinpv5KkDCgF2J+1ijDv87PlDrC+ldscP6s="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -86,12 +82,12 @@ effectiveStdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace ./ggml-metal.m \ + substituteInPlace ./ggml/src/ggml-metal.m \ --replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" - substituteInPlace ./scripts/build-info.cmake \ - --replace-fail 'set(BUILD_NUMBER 0)' 'set(BUILD_NUMBER ${finalAttrs.version})' \ - --replace-fail 'set(BUILD_COMMIT "unknown")' "set(BUILD_COMMIT \"$(cat COMMIT)\")" + substituteInPlace ./scripts/build-info.sh \ + --replace-fail 'build_number="0"' 'build_number="${finalAttrs.version}"' \ + --replace-fail 'build_commit="unknown"' "build_commit=\"$(cat COMMIT)\"" ''; nativeBuildInputs = [ cmake ninja pkg-config git ] @@ -109,17 +105,16 @@ effectiveStdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # -march=native is non-deterministic; override with platform-specific flags if needed - (cmakeBool "LLAMA_NATIVE" false) - (cmakeBool "BUILD_SHARED_SERVER" true) + (cmakeBool "GGML_NATIVE" false) + (cmakeBool "LLAMA_BUILD_SERVER" true) (cmakeBool "BUILD_SHARED_LIBS" true) - (cmakeBool "BUILD_SHARED_LIBS" true) - (cmakeBool "LLAMA_BLAS" blasSupport) - (cmakeBool "LLAMA_CLBLAST" openclSupport) - (cmakeBool "LLAMA_CUDA" cudaSupport) - (cmakeBool "LLAMA_HIPBLAS" rocmSupport) - (cmakeBool "LLAMA_METAL" metalSupport) - (cmakeBool "LLAMA_RPC" rpcSupport) - (cmakeBool "LLAMA_VULKAN" vulkanSupport) + (cmakeBool "GGML_BLAS" blasSupport) + (cmakeBool "GGML_CLBLAST" openclSupport) + (cmakeBool "GGML_CUDA" cudaSupport) + (cmakeBool "GGML_HIPBLAS" rocmSupport) + (cmakeBool "GGML_METAL" metalSupport) + (cmakeBool "GGML_RPC" rpcSupport) + (cmakeBool "GGML_VULKAN" vulkanSupport) ] ++ optionals cudaSupport [ (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) @@ -138,7 +133,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true) ] ++ optionals rpcSupport [ - "-DLLAMA_RPC=ON" # This is done so we can move rpc-server out of bin because llama.cpp doesn't # install rpc-server in their install target. "-DCMAKE_SKIP_BUILD_RPATH=ON" @@ -147,10 +141,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { # upstream plans on adding targets at the cmakelevel, remove those # additional steps after that postInstall = '' - mv $out/bin/main $out/bin/llama - mv $out/bin/server $out/bin/llama-server + # Match previous binary name for this package + ln -sf $out/bin/llama-cli $out/bin/llama + mkdir -p $out/include - cp $src/llama.h $out/include/ + cp $src/include/llama.h $out/include/ '' + optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server"; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index f08d2d1510b7f..dae2437472922 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://releases.lmstudio.ai/mac/arm64/${version}/latest/LM-Studio-${version}-arm64.dmg"; - hash = "sha256-byS0LNJQjs/+sf2anhTAdsXUWad9HujxmLx5uEfdlo8="; + hash = "sha256-zLbkb33Fmz2b+cloEINJybuj+i3ya+EVxb5CPWo/iXk="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index abca76ac032a8..d5647e72caaa7 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -8,7 +8,7 @@ let src = fetchurl { url = "https://releases.lmstudio.ai/linux/x86/${version}/beta/LM_Studio-${version}.AppImage"; - hash = "sha256-2a3ac+0m3C/YyPM0Waia+x2Q/lodfbyHNvlbB2AHT78="; + hash = "sha256-Mui9QxK7UDnt6cWpYzsoy4hp7P46kx/53+em7Alu1BA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 962bd58a94f0a..59af9b4f96b5b 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -5,7 +5,7 @@ }: let pname = "lmstudio"; - version = "0.2.25"; + version = "0.2.27"; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; homepage = "https://lmstudio.ai/"; diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index cdd75e4963f31..0ed72e05b4add 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (oldAttrs: { mainProgram = "logid"; homepage = "https://github.com/PixlOne/logiops"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; }) diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix index f2a9c5be1589c..b04e8d682e8ee 100644 --- a/pkgs/by-name/lo/logiops_0_2_3/package.nix +++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mainProgram = "logid"; homepage = "https://github.com/PixlOne/logiops"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 5b7ad4a2f64fe..668e1e2d1a255 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -22,9 +22,9 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "2.1.0-1"; + version = "2.2.0-1"; rev = "v${self.version}"; - hash = "sha256-qRvAryZ6SIhh5yDugcosVYOM2Tq0XPuaA6ib8/jWxNI="; + hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 0590cb37de8b4..f09541a3f57de 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -33,7 +33,7 @@ appimageTools.wrapType2 rec { homepage = "https://www.lunarclient.com/"; license = with licenses; [ unfree ]; mainProgram = "lunar-client"; - maintainers = with maintainers; [ zyansheep Technical27 surfaceflinger ]; + maintainers = with maintainers; [ Technical27 surfaceflinger ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/lx/lxc/4428.diff b/pkgs/by-name/lx/lxc/4428.diff deleted file mode 100644 index 05f0c660c5662..0000000000000 --- a/pkgs/by-name/lx/lxc/4428.diff +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml -index 92d6f01c3d..d2b67d8d6f 100644 ---- a/.github/workflows/build.yml -+++ b/.github/workflows/build.yml -@@ -50,6 +50,7 @@ jobs: - meson setup build \ - -Dtests=true \ - -Dpam-cgroup=true \ -+ -Dtools-multicall=true \ - -Dwerror=true \ - -Db_lto_mode=default - ninja -C build -diff --git a/src/lxc/cmd/meson.build b/src/lxc/cmd/meson.build -index 3ed3670e4b..edfb986622 100644 ---- a/src/lxc/cmd/meson.build -+++ b/src/lxc/cmd/meson.build -@@ -46,7 +46,7 @@ cmd_lxc_init_static_sources = files( - '../string_utils.c', - '../string_utils.h') + include_sources - --cmd_lxc_monitord_sources = files('lxc_monitord.c') + include_sources + netns_ifaddrs_sources -+cmd_lxc_monitord_sources = files('lxc_monitord.c') - cmd_lxc_user_nic_sources = files('lxc_user_nic.c') + cmd_common_sources + netns_ifaddrs_sources - cmd_lxc_usernsexec_sources = files('lxc_usernsexec.c') + cmd_common_sources + netns_ifaddrs_sources - -@@ -88,8 +88,8 @@ cmd_programs += executable( - 'lxc-monitord', - cmd_lxc_monitord_sources, - include_directories: liblxc_includes, -- dependencies: liblxc_dep, -- link_with: [liblxc_static], -+ dependencies: liblxc_dependencies, -+ link_whole: [liblxc_static], - install: true, - install_dir: lxclibexec) - -diff --git a/src/lxc/tools/meson.build b/src/lxc/tools/meson.build -index 00a863d936..6d317fc80b 100644 ---- a/src/lxc/tools/meson.build -+++ b/src/lxc/tools/meson.build -@@ -1,6 +1,7 @@ - # SPDX-License-Identifier: LGPL-2.1+ - --tools_common_sources = files('arguments.c', 'arguments.h') + include_sources + netns_ifaddrs_sources -+tools_common_sources = files('arguments.c', 'arguments.h') + include_sources -+tools_common_sources_for_dynamic_link = tools_common_sources + netns_ifaddrs_sources - - tools_commands_dynamic_link = ['attach', 'autostart', 'cgroup', 'checkpoint', 'config', - 'console', 'copy', 'create', 'destroy', 'device', 'execute', 'freeze', -@@ -15,7 +16,7 @@ if want_tools - foreach cmd : tools_commands_dynamic_link - public_programs += executable( - 'lxc-' + cmd, -- files('lxc_' + cmd + '.c') + tools_common_sources + liblxc_ext_sources, -+ files('lxc_' + cmd + '.c') + tools_common_sources_for_dynamic_link + liblxc_ext_sources, - dependencies: liblxc_dependencies, - include_directories: liblxc_includes, - c_args: ['-DNO_LXC_CONF'], -@@ -26,16 +27,16 @@ if want_tools - foreach cmd : tools_commands_static_link - public_programs += executable( - 'lxc-' + cmd, -- files('lxc_' + cmd + '.c') + tools_common_sources, -+ files('lxc_' + cmd + '.c') + files('arguments.c', 'arguments.h'), - dependencies: liblxc_dependencies, - include_directories: liblxc_includes, -- link_with: [liblxc_static], -+ link_whole: [liblxc_static], - install: true) - endforeach - endif - - if want_tools_multicall -- tools_all_sources = files('lxc_multicall.c') + tools_common_sources -+ tools_all_sources = files('lxc_multicall.c') + tools_common_sources_for_dynamic_link - foreach cmd : tools_commands - tools_all_sources += files('lxc_' + cmd + '.c') - endforeach diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix index ba817c1e2e50e..7b24d70b5d0ac 100644 --- a/pkgs/by-name/lx/lxc/package.nix +++ b/pkgs/by-name/lx/lxc/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lxc"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "lxc"; repo = "lxc"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-D994gekFgW/1Q4iVFM/3Zi0JXKn9Ghfd3UcjckVfoFY="; + hash = "sha256-fJMNdMXlV1z9q1pMDh046tNmLDuK6zh6uPahTWzWMvc="; }; nativeBuildInputs = [ @@ -48,17 +48,14 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fix docbook2man version detection ./docbook-hack.patch - - # fix linking - ./4428.diff ]; mesonFlags = [ "-Dinstall-init-files=false" "-Dinstall-state-dirs=false" "-Dspecfile=false" - # re-enable when fixed https://github.com/lxc/lxc/issues/4427 - # "-Dtools-multicall=true" + "-Dtools-multicall=true" + "-Dtools=false" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix index 67562ddc7baa2..6105b6ecd6a6c 100644 --- a/pkgs/by-name/lx/lxcfs/package.nix +++ b/pkgs/by-name/lx/lxcfs/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxcfs"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "v${version}"; - sha256 = "sha256-Mx2ZTul3hUEL9SloYSOh+MGoc2QmZg88MTsfIOvaIZU="; + sha256 = "sha256-kJ9QaNI8v03E0//UyU6fsav1YGOlKGMxsbE8Pr1Dtic="; }; patches = [ diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix index 41b20f4860687..0a95e10e9076c 100644 --- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix +++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix @@ -4,7 +4,7 @@ pkg-config, lxc, buildGo122Module, - fetchurl, + fetchFromGitHub, acl, libcap, dqlite, @@ -13,21 +13,22 @@ udev, installShellFiles, nixosTests, - gitUpdater, - callPackage, + nix-update-script, }: buildGo122Module rec { pname = "lxd-unwrapped-lts"; # major/minor are used in updateScript to pin to LTS - version = "5.21.0"; + version = "5.21.1"; - src = fetchurl { - url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-vnh+8Jm4Olg+VdAPpGboLSbChdnwsU84IgyzGe4ltg8="; + src = fetchFromGitHub { + owner = "canonical"; + repo = "lxd"; + rev = "refs/tags/lxd-${version}"; + hash = "sha256-6php6dThpyADOY+2PZ38WxK2jPKd61D0OCwTKjAhAUg="; }; - vendorHash = null; + vendorHash = "sha256-iGW2FQjuqANadFuMHa+2VXiUgoU0VFBJYUyh0pMIdWY="; postPatch = '' substituteInPlace shared/usbid/load.go \ @@ -87,11 +88,16 @@ buildGo122Module rec { installShellCompletion --bash --name lxd ./scripts/bash/lxd-client ''; - passthru.tests.lxd = nixosTests.lxd; - passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; - passthru.updateScript = gitUpdater { - url = "https://github.com/canonical/lxd.git"; - rev-prefix = "lxd-5.21"; + passthru = { + tests.lxd = nixosTests.lxd; + tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "lxd-(5.21.*)" + ]; + }; }; meta = with lib; { diff --git a/pkgs/by-name/ma/markdown-link-check/package.nix b/pkgs/by-name/ma/markdown-link-check/package.nix new file mode 100644 index 0000000000000..cfcb6689ca9e0 --- /dev/null +++ b/pkgs/by-name/ma/markdown-link-check/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "markdown-link-check"; + version = "3.12.2"; + + src = fetchFromGitHub { + owner = "tcort"; + repo = "markdown-link-check"; + rev = "v${version}"; + hash = "sha256-xeqvKPIJUDNEX9LdXpxoA7ECjGlfp/wwlCw/USZN47c="; + }; + + npmDepsHash = "sha256-J11NJRmXg2tj5BqGSQ8bMRJQUOCOZ9dEfa4Gzrf38t4="; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Checks all of the hyperlinks in a markdown text to determine if they are alive or dead"; + mainProgram = "markdown-link-check"; + homepage = "https://github.com/tcort/markdown-link-check"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/ma/marwaita-icons/package.nix b/pkgs/by-name/ma/marwaita-icons/package.nix new file mode 100644 index 0000000000000..022e56b834e55 --- /dev/null +++ b/pkgs/by-name/ma/marwaita-icons/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, breeze-icons +, hicolor-icon-theme +, pantheon +}: + +stdenvNoCC.mkDerivation rec { + pname = "marwaita-icons"; + version = "5.0"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = "marwaita-icons"; + rev = version; + hash = "sha256-6NFCXj80VAoFX+i4By5IpbtJC4qL+sAzlLHUJjTQ/sI="; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + hicolor-icon-theme + pantheon.elementary-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -a Marwaita* $out/share/icons + + for theme in $out/share/icons/*; do + gtk-update-icon-cache "$theme" + done + + runHook postInstall + ''; + + meta = { + description = "Icon pack for linux"; + homepage = "https://github.com/darkomarko42/Marwaita-Icons"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index 581b37dcde307..d0df9a933e93e 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "24.04"; + version = "24.06"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-6+sctwGiMFnHNsszuRoxcsT5jnNB5EoLMKEZGRkaJ00="; + hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index c55083e5b224b..fb459f8c440cd 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.140.0"; + version = "1.141.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-OVLG+MHgwWTorPuBTHsHUAY1FSN91j7xWgRDJ7FiO7E="; + hash = "sha256-x3LYTEZefOCd1LcAnrPsCMc/ydt3WBcAHBEmLv2bCh4="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-24PkWT5UZJwMtL3y8qdf3XFuf3v5PjiP9XESbw3oppY="; + hash = "sha256-+9cDCk4Dskea7l2xq7uEm+unmh48pnqMt2u6weWEVNY="; }; buildPhase = '' diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix new file mode 100644 index 0000000000000..3a85f8e5f443c --- /dev/null +++ b/pkgs/by-name/me/metadata/package.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, ffmpeg_7 +, rustPlatform +, glib +, installShellFiles +, asciidoc +}: +rustPlatform.buildRustPackage rec { + pname = "metadata"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "zmwangx"; + repo = "metadata"; + rev = "v${version}"; + hash = "sha256-OFWdCV9Msy/mNaSubqoJi4tBiFqL7RuWWQluSnKe4fU="; + }; + + cargoHash = "sha256-F5jXS/W600nbQtu1FD4+DawrFsO+5lJjvAvTiFKT840="; + + nativeBuildInputs = [ + pkg-config + asciidoc + installShellFiles + rustPlatform.bindgenHook + ]; + + postBuild = '' + a2x --doctype manpage --format manpage man/metadata.1.adoc + ''; + postInstall = '' + installManPage man/metadata.1 + ''; + + buildInputs = [ + ffmpeg_7 + glib + ]; + + env.FFMPEG_DIR = ffmpeg_7.dev; + + meta = { + description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg"; + maintainers = with lib.maintainers; [ clevor ]; + license = lib.licenses.mit; + homepage = "https://github.com/zmwangx/metadata"; + mainProgram = "metadata"; + }; +} diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index b17e4c4b29ec8..50529dec4b772 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.5"; + version = "1.18.6"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-YNnZ/wlOzmTAD76py4CRlClPi2S1b4PaanCfT/Q426A="; + hash = "sha256-h/H5T9UBCp/gXM+c5muRs8luz3LoHofBGwP3jofQ9Qg="; }; - vendorHash = "sha256-yBQ4Nt03VS2em6vkzMa1WH9jHc6pwdlW0tt9cth55oQ="; + vendorHash = "sha256-lBHL4vD+0JDOlc6SWFsj0cerE/ypImoh8UFbL736SmA="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index b8ca2a9c5931f..c5117f038e090 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-aqoUsVj9XYlbi8wh2Rqxy+M9+RU9NLp97qlpTKUlJEI="; + hash = "sha256-3Frgeudh1Z4gpQJqyLxBZKi7gr4GIGLv7gW4Qf3LdVs="; }; - cargoHash = "sha256-G9nIlri7VwojNRsCwZxseZxcSxLqAKtnm+AV7TLqJm4="; + cargoHash = "sha256-7ohhnuy8baELLDvf0FfdJmSf62wtmnEfI2rl9yZp03w="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/mistral-rs/Cargo.lock b/pkgs/by-name/mi/mistral-rs/Cargo.lock new file mode 100644 index 0000000000000..edc87e02386e0 --- /dev/null +++ b/pkgs/by-name/mi/mistral-rs/Cargo.lock @@ -0,0 +1,5046 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "accelerate-src" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "akin" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1763692fc1416554cf051efc56a3de5595eca47299d731cc5c2b583adf8b4d2f" + +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +dependencies = [ + "backtrace", +] + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "backtrace" +version = "0.3.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bindgen_cuda" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8489af5b7d17a81bffe37e0f4d6e1e4de87c87329d05447f22c35d95a1227d" +dependencies = [ + "glob", + "num_cpus", + "rayon", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitstream-io" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "buildstructor" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3907aac66c65520545ae3cb3c195306e20d5ed5c90bfbb992e061cf12a104d0" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "str_inflector", + "syn 2.0.66", + "thiserror", + "try_match", +] + +[[package]] +name = "built" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "candle-core" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "accelerate-src", + "byteorder", + "candle-kernels", + "candle-metal-kernels", + "cudarc", + "gemm", + "half", + "intel-mkl-src", + "libc", + "memmap2", + "metal", + "num-traits", + "num_cpus", + "rand", + "rand_distr", + "rayon", + "safetensors", + "thiserror", + "yoke", + "zip", +] + +[[package]] +name = "candle-flash-attn" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "anyhow", + "bindgen_cuda", + "candle-core", + "half", +] + +[[package]] +name = "candle-kernels" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "bindgen_cuda", +] + +[[package]] +name = "candle-metal-kernels" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "metal", + "once_cell", + "thiserror", + "tracing", +] + +[[package]] +name = "candle-nn" +version = "0.6.0" +source = "git+https://github.com/EricLBuehler/candle.git?rev=f52e2347b6237d19ffd7af26315f543c22f9f286#f52e2347b6237d19ffd7af26315f543c22f9f286" +dependencies = [ + "accelerate-src", + "candle-core", + "candle-metal-kernels", + "half", + "intel-mkl-src", + "metal", + "num-traits", + "rayon", + "safetensors", + "serde", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +dependencies = [ + "jobserver", + "libc", + "once_cell", +] + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cfgrammar" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec07af28018dd8b4b52e49eb6e57268b19dda0996d4824889eb07ee0ef67378c" +dependencies = [ + "indexmap", + "lazy_static", + "num-traits", + "regex", + "serde", + "vob", +] + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.5", +] + +[[package]] +name = "chrono-tz" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "clap" +version = "4.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", +] + +[[package]] +name = "clap_derive" +version = "4.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] +name = "cli-table" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" +dependencies = [ + "cli-table-derive", + "csv", + "termcolor", + "unicode-width", +] + +[[package]] +name = "cli-table-derive" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags 1.3.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctrlc" +version = "3.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +dependencies = [ + "nix", + "windows-sys 0.52.0", +] + +[[package]] +name = "cudarc" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89df33b4eb35d6d3f19ce8015fda23079131afef42cf6ede03e961ab8aeb29af" +dependencies = [ + "half", + "libloading", +] + +[[package]] +name = "darling" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbffa8f8e38810422f320ca457a93cf1cd0056dc9c06c556b867558e0d471463" +dependencies = [ + "darling_core 0.11.0", + "darling_macro 0.11.0", +] + +[[package]] +name = "darling" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +dependencies = [ + "darling_core 0.20.9", + "darling_macro 0.20.9", +] + +[[package]] +name = "darling_core" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e172685d94b7b83800e3256a63261537b9d6129e10f21c8e13ddf9dba8c64d" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.66", +] + +[[package]] +name = "darling_macro" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0618ac802792cebd1918ac6042a6ea1eeab92db34b35656afaa577929820788" +dependencies = [ + "darling_core 0.11.0", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.20.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +dependencies = [ + "darling_core 0.20.9", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "defmac" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aafbece59594ed57696a1a69e8bb3ca1683fbc9cdb41d5c02726070b2cd8f19d" + +[[package]] +name = "derive-new" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.9", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core", + "syn 2.0.66", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] +name = "either" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +dependencies = [ + "serde", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "esaxx-rs" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "galil-seiferas" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794ac25cfda3fa11d2b07ff8c65889c6c03411646df54e59e606878d899e1d5a" +dependencies = [ + "defmac", + "unchecked-index", +] + +[[package]] +name = "gemm" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab24cc62135b40090e31a76a9b2766a501979f3070fa27f689c27ec04377d32" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c030d0b983d1e34a546b86e08f600c11696fde16199f971cd46c12e67512c0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb5f2e79fefb9693d18e1066a557b4546cd334b226beadc68b11a8f9431852a" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2e7ea062c987abcd8db95db917b4ffb4ecdfd0668471d8dc54734fdff2354e8" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", + "sysctl", +] + +[[package]] +name = "gemm-f16" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca4c06b9b11952071d317604acb332e924e817bd891bec8dfb494168c7cedd4" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9a69f51aaefbd9cf12d18faf273d3e982d9d711f60775645ed5c8047b4ae113" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa397a48544fadf0b81ec8741e5c0fba0043008113f71f2034def1935645d2b0" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "getset" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "gif" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", + "rand", + "rand_distr", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hf-hub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" +dependencies = [ + "dirs", + "indicatif", + "log", + "native-tls", + "rand", + "serde", + "serde_json", + "thiserror", + "ureq", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +dependencies = [ + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "image" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "image-webp", + "num-traits", + "png", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core", + "zune-jpeg", +] + +[[package]] +name = "image-webp" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +dependencies = [ + "byteorder-lite", + "thiserror", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "rayon", + "unicode-width", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "intel-mkl-src" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee70586cd5b3e772a8739a1bd43eaa90d4f4bf0fb2a4edc202e979937ee7f5e" +dependencies = [ + "anyhow", + "intel-mkl-tool", + "ocipkg", +] + +[[package]] +name = "intel-mkl-tool" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887a16b4537d82227af54d3372971cfa5e0cde53322e60f57584056c16ada1b4" +dependencies = [ + "anyhow", + "log", + "walkdir", +] + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.5", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "lrtable" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fcefc5628209d1b1f4b2cd0bcefd0e50be80bdf178e886cb07317f5ce4f2856" +dependencies = [ + "cfgrammar", + "fnv", + "num-traits", + "sparsevec", + "vob", +] + +[[package]] +name = "macro_rules_attribute" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" +dependencies = [ + "macro_rules_attribute-proc_macro", + "paste", +] + +[[package]] +name = "macro_rules_attribute-proc_macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", + "stable_deref_trait", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.5.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minijinja" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e136ef580d7955019ab0a407b68d77c292a9976907e217900f3f76bc8f6dc1a4" +dependencies = [ + "serde", +] + +[[package]] +name = "minijinja-contrib" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15ee37078c98d31e510d6a7af488031a2c3ccacdb76c5c4fc98ddfe6d0e9da07" +dependencies = [ + "minijinja", + "serde", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mistralrs" +version = "0.1.18" +dependencies = [ + "anyhow", + "candle-core", + "either", + "image", + "indexmap", + "mistralrs-core", + "serde_json", + "tokio", +] + +[[package]] +name = "mistralrs-bench" +version = "0.1.18" +dependencies = [ + "anyhow", + "candle-core", + "clap", + "cli-table", + "either", + "mistralrs-core", + "serde", + "serde_json", + "tokio", + "tracing", +] + +[[package]] +name = "mistralrs-core" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "akin", + "anyhow", + "async-trait", + "bindgen_cuda", + "buildstructor", + "bytemuck", + "candle-core", + "candle-flash-attn", + "candle-nn", + "cfgrammar", + "chrono", + "clap", + "derive-new", + "derive_more", + "dirs", + "either", + "futures", + "galil-seiferas", + "half", + "hf-hub", + "image", + "indexmap", + "indicatif", + "intel-mkl-src", + "itertools 0.13.0", + "lrtable", + "minijinja", + "minijinja-contrib", + "mistralrs-vision", + "once_cell", + "pyo3", + "radix_trie", + "rand", + "rand_isaac", + "range-checked", + "rayon", + "regex-automata 0.4.7", + "rustc-hash", + "serde", + "serde_json", + "strum", + "thiserror", + "tokenizers", + "tokio", + "tokio-rayon", + "toml", + "tqdm", + "tracing", + "tracing-subscriber", + "variantly", + "vob", +] + +[[package]] +name = "mistralrs-pyo3" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "base64 0.22.1", + "candle-core", + "either", + "futures", + "image", + "indexmap", + "intel-mkl-src", + "mistralrs-core", + "pyo3", + "pyo3-build-config", + "reqwest", + "serde", + "serde_json", + "tokio", +] + +[[package]] +name = "mistralrs-server" +version = "0.1.18" +dependencies = [ + "accelerate-src", + "anyhow", + "axum", + "base64 0.22.1", + "candle-core", + "clap", + "ctrlc", + "either", + "futures", + "image", + "indexmap", + "intel-mkl-src", + "mistralrs-core", + "once_cell", + "reqwest", + "serde", + "serde_json", + "tokio", + "tower-http", + "tracing", + "utoipa", + "utoipa-swagger-ui", +] + +[[package]] +name = "mistralrs-vision" +version = "0.1.18" +dependencies = [ + "candle-core", + "image", +] + +[[package]] +name = "monostate" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d208407d7552cd041d8cdb69a1bc3303e029c598738177a3d87082004dc0e1e" +dependencies = [ + "monostate-impl", + "serde", +] + +[[package]] +name = "monostate-impl" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "native-tls" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "object" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +dependencies = [ + "memchr", +] + +[[package]] +name = "oci-spec" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e423c4f827362c0d8d8da4b1f571270f389ebde73bcd3240a3d23c6d6f61d0f0" +dependencies = [ + "derive_builder", + "getset", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "ocipkg" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb3293021f06540803301af45e7ab81693d50e89a7398a3420bdab139e7ba5e" +dependencies = [ + "base16ct", + "base64 0.22.1", + "chrono", + "directories", + "flate2", + "lazy_static", + "log", + "oci-spec", + "regex", + "serde", + "serde_json", + "sha2", + "tar", + "thiserror", + "toml", + "ureq", + "url", + "uuid 1.8.0", + "walkdir", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.5.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "packedvec" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde3c690ec20e4a2b4fb46f0289a451181eb50011a1e2acc8d85e2fde9062a45" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.1", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" +dependencies = [ + "regex", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "png" +version = "0.17.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pulp" +version = "0.18.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec8d02258294f59e4e223b41ad7e81c874aa6b15bc4ced9ba3965826da0eed5" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] +name = "pyo3" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +dependencies = [ + "anyhow", + "cfg-if", + "chrono", + "chrono-tz", + "either", + "eyre", + "hashbrown", + "indexmap", + "indoc", + "libc", + "memoffset", + "num-bigint", + "num-complex", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "rust_decimal", + "serde", + "smallvec", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "rand_isaac" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4373cd91b4f55722c553fb0f286edbb81ef3ff6eec7b99d1898a4110a0b28" +dependencies = [ + "rand_core", +] + +[[package]] +name = "range-checked" +version = "0.1.0" +source = "git+https://github.com/EricLBuehler/range-checked.git#655349cc093fcd4965f35b25de394a24ff4b0c7b" + +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand", + "rand_chacha", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-cond" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" +dependencies = [ + "either", + "itertools 0.11.0", + "rayon", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-tls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 0.1.2", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rust-embed" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 2.0.66", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust_decimal" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +dependencies = [ + "arrayvec", + "num-traits", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-webpki" +version = "0.102.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "safetensors" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ced76b22c7fba1162f11a5a75d9d8405264b467a07ae0c9c29be119b9297db9" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +dependencies = [ + "bitflags 2.5.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "seq-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "sparsevec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35df5d2e580b29f3f7ec5b4ed49b0ab3acf7f3624122b3e823cafb9630f293b8" +dependencies = [ + "num-traits", + "packedvec", + "serde", + "vob", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spm_precompiled" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5851699c4033c63636f7ea4cf7b7c1f1bf06d0cc03cfb42e711de5a5c46cf326" +dependencies = [ + "base64 0.13.1", + "nom", + "serde", + "unicode-segmentation", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "str_inflector" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0b848d5a7695b33ad1be00f84a3c079fe85c9278a325ff9159e6c99cef4ef7" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.66", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.5.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokenizers" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e500fad1dd3af3d626327e6a3fe5050e664a6eaa4708b8ca92f1794aaf73e6fd" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "getrandom", + "indicatif", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax 0.8.4", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "tokio" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rayon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cf33a76e0b1dd03b778f83244137bd59887abf25c0e87bc3e7071105f457693" +dependencies = [ + "rayon", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.14", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.13", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" +dependencies = [ + "bitflags 2.5.0", + "bytes", + "http", + "http-body", + "http-body-util", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tqdm" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2d2932240205a99b65f15d9861992c95fbb8c9fb280b3a1f17a92db6dc611f" +dependencies = [ + "anyhow", + "crossterm", + "once_cell", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "try_match" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61ae3c1941e8859e30d28e572683fbfa89ae5330748b45139aedf488389e2be4" +dependencies = [ + "try_match_inner", +] + +[[package]] +name = "try_match_inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0a91713132798caecb23c977488945566875e7b61b902fb111979871cbff34e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unchecked-index" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization-alignments" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f613e4fa046e69818dd287fdc4bc78175ff20331479dab6e1b0f98d57062de" +dependencies = [ + "smallvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "rustls-webpki", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "utoipa" +version = "4.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" +dependencies = [ + "indexmap", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 2.0.66", +] + +[[package]] +name = "utoipa-swagger-ui" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943e0ff606c6d57d410fd5663a4d7c074ab2c5f14ab903b9514565e59fa1189e" +dependencies = [ + "axum", + "mime_guess", + "regex", + "reqwest", + "rust-embed", + "serde", + "serde_json", + "url", + "utoipa", + "zip", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", +] + +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "variantly" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a332341ba79a179d9e9b33c0d72fbf3dc2c80e1be79416401a08d2b820ef56" +dependencies = [ + "Inflector", + "darling 0.11.0", + "proc-macro2", + "quote", + "syn 1.0.109", + "uuid 0.8.2", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vob" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c058f4c41e71a043c67744cb76dcc1ae63ece328c1732a72489ccccc2dec23e6" +dependencies = [ + "num-traits", + "rustc_version", + "serde", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.66", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + +[[package]] +name = "zip" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "displaydoc", + "flate2", + "indexmap", + "num_enum", + "thiserror", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix new file mode 100644 index 0000000000000..4c5324e8d856e --- /dev/null +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -0,0 +1,201 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + + # nativeBuildInputs + pkg-config, + python3, + + # buildInputs + oniguruma, + openssl, + mkl, + stdenv, + darwin, + + # env + fetchurl, + + testers, + mistral-rs, + + cudaPackages, + cudaCapability ? null, + + config, + # one of `[ null false "cuda" "mkl" "metal" ]` + acceleration ? null, + +}: + +let + accelIsValid = builtins.elem acceleration [ + null + false + "cuda" + "mkl" + "metal" + ]; + + cudaSupport = + assert accelIsValid; + (acceleration == "cuda") || (config.cudaSupport && acceleration == null); + + minRequiredCudaCapability = "6.1"; # build fails with 6.0 + inherit (cudaPackages.cudaFlags) cudaCapabilities; + cudaCapabilityString = + if cudaCapability == null then + (builtins.head ( + (builtins.filter (cap: lib.versionAtLeast cap minRequiredCudaCapability) cudaCapabilities) + ++ [ + (lib.warn "mistral-rs doesn't support ${lib.concatStringsSep " " cudaCapabilities}" minRequiredCudaCapability) + ] + )) + else + cudaCapability; + cudaCapability' = lib.toInt (cudaPackages.cudaFlags.dropDot cudaCapabilityString); + + # TODO Should we assert mklAccel -> stdenv.isLinux && stdenv.isx86_64 ? + mklSupport = + assert accelIsValid; + (acceleration == "mkl"); + + metalSupport = + assert accelIsValid; + (acceleration == "metal") || (stdenv.isDarwin && stdenv.isAarch64 && (acceleration == null)); + + darwinBuildInputs = + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreVideo + CoreGraphics + ] + ++ lib.optionals metalSupport [ + MetalKit + MetalPerformanceShaders + ]; +in + +rustPlatform.buildRustPackage rec { + pname = "mistral-rs"; + version = "0.1.18"; + + src = fetchFromGitHub { + owner = "EricLBuehler"; + repo = "mistral.rs"; + rev = "refs/tags/v${version}"; + hash = "sha256-lMDFWNv9b0UfckqLmyWRVwnqmGe6nxYsUHzoi2+oG84="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "candle-core-0.6.0" = "sha256-DxGBWf2H7MamrbboTJ4zHy1HeE8ZVT7QvE3sTYrRxBc="; + "range-checked-0.1.0" = "sha256-S+zcF13TjwQPFWZLIbUDkvEeaYdaxCOtDLtI+JRvum8="; + }; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + python3 + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + + buildInputs = + [ + oniguruma + openssl + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvrtc + cudaPackages.libcublas + cudaPackages.libcurand + ] + ++ lib.optionals mklSupport [ mkl ] + ++ lib.optionals stdenv.isDarwin darwinBuildInputs; + + cargoBuildFlags = + lib.optionals cudaSupport [ "--features=cuda" ] + ++ lib.optionals mklSupport [ "--features=mkl" ] + ++ lib.optionals (stdenv.isDarwin && metalSupport) [ "--features=metal" ]; + + env = + { + SWAGGER_UI_DOWNLOAD_URL = + let + # When updating: + # - Look for the version of `utopia-swagger-ui` at: + # https://github.com/EricLBuehler/mistral.rs/blob/v<MISTRAL-RS-VERSION>/mistralrs-server/Cargo.toml + # - Look at the corresponding version of `swagger-ui` at: + # https://github.com/juhaku/utoipa/blob/utoipa-swagger-ui-<UTOPIA-SWAGGER-UI-VERSION>/utoipa-swagger-ui/build.rs#L21-L22 + swaggerUiVersion = "5.17.12"; + + swaggerUi = fetchurl { + url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v${swaggerUiVersion}.zip"; + hash = "sha256-HK4z/JI+1yq8BTBJveYXv9bpN/sXru7bn/8g5mf2B/I="; + }; + in + "file://${swaggerUi}"; + + RUSTONIG_SYSTEM_LIBONIG = true; + } + // (lib.optionalAttrs cudaSupport { + CUDA_COMPUTE_CAP = cudaCapability'; + + # Apparently, cudart is enough: No need to provide the entire cudaPackages.cudatoolkit derivation. + CUDA_TOOLKIT_ROOT_DIR = lib.getDev cudaPackages.cuda_cudart; + }); + + NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [ + "-I${lib.getDev cudaPackages.cuda_cudart}/include" + "-I${lib.getDev cudaPackages.cuda_cccl}/include" + ]; + + # swagger-ui will once more be copied in the target directory during the check phase + # Not deleting the existing unpacked archive leads to a `PermissionDenied` error + preCheck = '' + rm -rf target/${stdenv.hostPlatform.config}/release/build/ + ''; + + # Try to access internet + checkFlags = [ + "--skip=gguf::gguf_tokenizer::tests::test_decode_gpt2" + "--skip=gguf::gguf_tokenizer::tests::test_decode_llama" + "--skip=gguf::gguf_tokenizer::tests::test_encode_gpt2" + "--skip=gguf::gguf_tokenizer::tests::test_encode_llama" + "--skip=sampler::tests::test_argmax" + "--skip=sampler::tests::test_gumbel_speculative" + ]; + + passthru = { + tests = { + version = testers.testVersion { package = mistral-rs; }; + + withMkl = mistral-rs.override { acceleration = "mkl"; }; + withCuda = mistral-rs.override { acceleration = "cuda"; }; + withMetal = mistral-rs.override { acceleration = "metal"; }; + }; + }; + + meta = { + description = "Blazingly fast LLM inference"; + homepage = "https://github.com/EricLBuehler/mistral.rs"; + changelog = "https://github.com/EricLBuehler/mistral.rs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "mistralrs-server"; + platforms = + if cudaSupport then + lib.platforms.linux + else if metalSupport then + [ "aarch64-darwin" ] + else + lib.platforms.unix; + broken = mklSupport; + }; +} diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 280b8caae9969..c83c91e20e49e 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/FWDekker/mommy/blob/v${version}/CHANGELOG.md"; license = licenses.unlicense; platforms = platforms.all; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; mainProgram = "mommy"; }; } diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/by-name/mo/monado/package.nix index 4cbd7a8f00c9b..6f420f497e333 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -9,7 +9,6 @@ , doxygen , eigen , elfutils -, ffmpeg , glslang , gst-plugins-base , gstreamer @@ -31,6 +30,7 @@ , libXdmcp , libXext , libXrandr +, nix-update-script , onnxruntime , opencv4 , openhmd @@ -51,23 +51,23 @@ , zlib , zstd , nixosTests -# Set as 'false' to build monado without service support, i.e. allow VR -# applications linking against libopenxr_monado.so to use OpenXR standalone -# instead of via the monado-service program. For more information see: -# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled + # Set as 'false' to build monado without service support, i.e. allow VR + # applications linking against libopenxr_monado.so to use OpenXR standalone + # instead of via the monado-service program. For more information see: + # https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled , serviceSupport ? true }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "monado"; - version = "unstable-2024-01-02"; + version = "24.0.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "bfa1c16ff9fc759327ca251a5d086b958b1a3b8a"; - hash = "sha256-wXRwOs9MkDre/VeW686DzmvKjX0qCSS13MILbYQD6OY="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-lFy0VvaLD4Oyu2TZJnaIWjuaJUZjGGDJS0VsRfIUpcc="; }; nativeBuildInputs = [ @@ -92,7 +92,6 @@ stdenv.mkDerivation { dbus eigen elfutils - ffmpeg gst-plugins-base gstreamer hidapi @@ -143,8 +142,9 @@ stdenv.mkDerivation { export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} ''; - passthru.tests = { - basic-service = nixosTests.monado; + passthru = { + updateScript = nix-update-script { }; + tests.basic-service = nixosTests.monado; }; meta = with lib; { @@ -155,4 +155,4 @@ stdenv.mkDerivation { platforms = platforms.linux; mainProgram = "monado-cli"; }; -} +}) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 5e79e29ee4586..45a9d0470aad4 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.380"; + version = "0.0.381"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-DAOSkWT+fe0av0EpjK8HxgIei6urgFJrNeMdZfrDqDM="; + hash = "sha256-WQBA3NtkxrN3NzKl/DsIlp8gdqQpo05n1MZzIKNJdQc="; }; vendorHash = "sha256-y+mXUzkY5w2hYECtfcBBUCWsRwhip6IhX617lRX698Q="; diff --git a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix index 638d6ac671e15..cb8c6434e24cb 100644 --- a/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix +++ b/pkgs/by-name/na/nautilus-open-in-blackbox/package.nix @@ -1,4 +1,4 @@ -{ python3, fetchFromGitHub, gnome, stdenv, lib }: +{ python3, fetchFromGitHub, nautilus-python, stdenv, lib }: stdenv.mkDerivation rec { pname = "nautilus-open-in-blackbox"; version = "0.1.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./paths.patch ]; buildInputs = [ - gnome.nautilus-python + nautilus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch b/pkgs/by-name/na/nautilus-python/fix-paths.patch index ba82937d6c9c5..ba82937d6c9c5 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch +++ b/pkgs/by-name/na/nautilus-python/fix-paths.patch diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/by-name/na/nautilus-python/package.nix index 73767f31219de..993d3e2933aff 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/by-name/na/nautilus-python/package.nix @@ -1,26 +1,32 @@ -{ stdenv -, lib -, substituteAll -, fetchurl -, meson -, ninja -, pkg-config -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_412 -, python3 -, nautilus -, gnome +{ + stdenv, + lib, + substituteAll, + fetchurl, + meson, + ninja, + pkg-config, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_412, + python3, + nautilus, + gnome, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "nautilus-python"; version = "4.0.1"; - outputs = [ "out" "dev" "doc" "devdoc" ]; + outputs = [ + "out" + "dev" + "doc" + "devdoc" + ]; src = fetchurl { - url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor version}/nautilus-python-${version}.tar.xz"; + url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor finalAttrs.version}/nautilus-python-${finalAttrs.version}.tar.xz"; hash = "sha256-/EnBBPsyoK0ZWmawE2eEzRnRDYs+jVnV7n9z6PlOko8="; }; @@ -51,8 +57,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "nautilus-python"; }; }; @@ -63,4 +68,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/by-name/na/nautilus/extension_dir.patch index d7cd161a8dfc5..d7cd161a8dfc5 100644 --- a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch +++ b/pkgs/by-name/na/nautilus/extension_dir.patch diff --git a/pkgs/desktops/gnome/core/nautilus/fix-paths.patch b/pkgs/by-name/na/nautilus/fix-paths.patch index dc9874359b233..dc9874359b233 100644 --- a/pkgs/desktops/gnome/core/nautilus/fix-paths.patch +++ b/pkgs/by-name/na/nautilus/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/by-name/na/nautilus/package.nix index f8d650b4648a2..660867e81ebd8 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -1,46 +1,52 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gi-docgen -, docbook-xsl-nons -, gettext -, desktop-file-utils -, wrapGAppsHook4 -, gtk4 -, libadwaita -, libportal-gtk4 -, gnome -, gnome-autoar -, glib-networking -, shared-mime-info -, libnotify -, libexif -, libjxl -, libseccomp -, librsvg -, webp-pixbuf-loader -, tracker -, tracker-miners -, gexiv2 -, libselinux -, libcloudproviders -, gdk-pixbuf -, substituteAll -, gnome-desktop -, gst_all_1 -, gsettings-desktop-schemas -, gnome-user-share -, gobject-introspection +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + gi-docgen, + docbook-xsl-nons, + gettext, + desktop-file-utils, + wrapGAppsHook4, + gtk4, + libadwaita, + libportal-gtk4, + gnome, + adwaita-icon-theme, + gnome-autoar, + glib-networking, + shared-mime-info, + libnotify, + libexif, + libjxl, + libseccomp, + librsvg, + webp-pixbuf-loader, + tracker, + tracker-miners, + gexiv2, + libselinux, + libcloudproviders, + gdk-pixbuf, + substituteAll, + gnome-desktop, + gst_all_1, + gsettings-desktop-schemas, + gnome-user-share, + gobject-introspection, }: stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; version = "46.2"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ + "out" + "dev" + "devdoc" + ]; src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; @@ -74,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { gexiv2 glib-networking gnome-desktop - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas gnome-user-share gst_all_1.gst-plugins-base @@ -120,7 +126,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "nautilus"; - attrPath = "gnome.nautilus"; }; }; diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/by-name/ne/neovim-gtk/package.nix index eebb980f85cb5..eebb980f85cb5 100644 --- a/pkgs/applications/editors/neovim/neovim-gtk.nix +++ b/pkgs/by-name/ne/neovim-gtk/package.nix diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/by-name/ne/neovim-remote/package.nix index f85d379faa85c..f85d379faa85c 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/by-name/ne/neovim-remote/package.nix diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock index f0fe7268f0b22..0c1286e542a49 100644 --- a/pkgs/by-name/ni/niri/Cargo.lock +++ b/pkgs/by-name/ni/niri/Cargo.lock @@ -38,9 +38,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.5.0", @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "appendlist" @@ -144,6 +144,15 @@ dependencies = [ ] [[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -172,16 +181,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -224,17 +233,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", @@ -252,12 +261,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -286,17 +295,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", @@ -321,7 +330,16 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", +] + +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", ] [[package]] @@ -360,7 +378,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -406,32 +424,21 @@ dependencies = [ ] [[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", "objc2", ] [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", @@ -446,22 +453,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -508,7 +515,7 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.5.0", "log", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", "thiserror", @@ -516,18 +523,17 @@ dependencies = [ [[package]] name = "calloop" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10" dependencies = [ "async-task", "bitflags 2.5.0", "futures-io", "log", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", - "thiserror", ] [[package]] @@ -544,9 +550,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -586,9 +592,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "cgmath" @@ -596,7 +602,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" dependencies = [ - "approx", + "approx 0.4.0", "num-traits", ] @@ -611,9 +617,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -651,7 +657,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -764,18 +770,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -902,6 +908,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + +[[package]] name = "drm" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -948,15 +960,15 @@ checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" [[package]] name = "either" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -964,13 +976,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1008,20 +1020,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1030,21 +1031,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -1116,7 +1107,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1218,7 +1209,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1277,9 +1268,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1289,9 +1280,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ "gio-sys", "glib-sys", @@ -1379,9 +1370,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" dependencies = [ "futures-channel", "futures-core", @@ -1397,9 +1388,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ "glib-sys", "gobject-sys", @@ -1425,7 +1416,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1441,15 +1432,15 @@ dependencies = [ [[package]] name = "glam" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" [[package]] name = "glib" -version = "0.19.6" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0116c428e4841cab183a32a71b900fd6712194c20f9c424f01d2c016c96bd23" +checksum = "b664491bc77ab55daa6714a592cdbe1a55e28abec09cb50e87689b90de456ff4" dependencies = [ "bitflags 2.5.0", "futures-channel", @@ -1469,22 +1460,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c" +checksum = "1d405205a405182f95e637710850a8e82f25ba01fdd6baebc82dabeaf0883376" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", "system-deps", @@ -1498,9 +1489,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys", "libc", @@ -1509,9 +1500,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" dependencies = [ "glib", "graphene-sys", @@ -1520,9 +1511,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ "glib-sys", "libc", @@ -1591,7 +1582,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -1645,21 +1636,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] -name = "hex" -version = "0.4.3" +name = "hermit-abi" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] -name = "icrate" -version = "0.0.4" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "idna" @@ -1703,9 +1689,9 @@ checksum = "bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0" [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -1716,7 +1702,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -1801,7 +1787,7 @@ dependencies = [ "libc", "proc-macro2", "regex", - "syn 2.0.63", + "syn 2.0.67", "terminal_size", ] @@ -1893,9 +1879,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1921,7 +1907,7 @@ checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -2000,9 +1986,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux-raw-sys" @@ -2062,9 +2048,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2122,7 +2108,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2133,9 +2119,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2143,9 +2129,9 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.5.0", "jni-sys", @@ -2164,24 +2150,26 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.5.0+25.2.9519653" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ "jni-sys", ] [[package]] name = "niri" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", + "approx 0.5.1", "arrayvec", "async-channel", "async-io 1.13.0", + "atomic", "bitflags 2.5.0", "bytemuck", - "calloop 0.13.0", + "calloop 0.14.0", "clap", "directories", "drm-ffi", @@ -2197,6 +2185,7 @@ dependencies = [ "niri-config", "niri-ipc", "notify-rust", + "ordered-float", "pangocairo", "pipewire", "png", @@ -2220,13 +2209,14 @@ dependencies = [ [[package]] name = "niri-config" -version = "0.1.6" +version = "0.1.7" dependencies = [ "bitflags 2.5.0", "csscolorparser", "knuffel", "miette", "niri-ipc", + "pretty_assertions", "regex", "smithay", "tracing", @@ -2235,7 +2225,7 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "0.1.6" +version = "0.1.7" dependencies = [ "clap", "serde", @@ -2244,7 +2234,7 @@ dependencies = [ [[package]] name = "niri-visual-tests" -version = "0.1.6" +version = "0.1.7" dependencies = [ "anyhow", "gtk4", @@ -2343,10 +2333,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2371,25 +2361,206 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", ] [[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] + +[[package]] name = "objc2-encode" -version = "3.0.0" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "objc_id" @@ -2422,6 +2593,15 @@ dependencies = [ ] [[package]] +name = "ordered-float" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +dependencies = [ + "num-traits", +] + +[[package]] name = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2439,9 +2619,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", "glib", @@ -2451,9 +2631,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ "glib-sys", "gobject-sys", @@ -2463,9 +2643,9 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.19.2" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687" +checksum = "e4c8b43c02ec1c4e16daf7fc50fbce6b8ead5705c18ae56274f703233cce1cd9" dependencies = [ "cairo-rs", "glib", @@ -2476,9 +2656,9 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.19.5" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d680caf5094d735c37312ce9166127a1d759d86a3d632b83d4a5354ee7568659" +checksum = "591904498438879785f5b7a2fdf7c38e9ec08c514b93c614b5c3b48cd11dd8d7" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -2535,7 +2715,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2548,6 +2728,26 @@ dependencies = [ ] [[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.67", +] + +[[package]] name = "pin-project-lite" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2561,9 +2761,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -2653,13 +2853,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix 0.38.34", "tracing", @@ -2685,6 +2885,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + +[[package]] name = "proc-macro-crate" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2729,9 +2939,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2753,7 +2963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -2770,7 +2980,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", "rusty-fork", "tempfile", "unarray", @@ -2861,18 +3071,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "redox_syscall" @@ -2896,14 +3097,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -2917,13 +3118,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -2934,9 +3135,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -2976,7 +3177,7 @@ dependencies = [ "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -3039,22 +3240,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3076,7 +3277,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3153,11 +3354,11 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#900b938970081cb525dc94ff083d76aa07c60e54" +source = "git+https://github.com/Smithay/smithay.git#234586dbea6bc084cb72a32f164997e47ea36b2b" dependencies = [ "appendlist", "bitflags 2.5.0", - "calloop 0.13.0", + "calloop 0.14.0", "cc", "cgmath", "cursor-icon", @@ -3187,10 +3388,12 @@ dependencies = [ "tracing", "udev", "wayland-backend", + "wayland-client", + "wayland-cursor", "wayland-egl", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-protocols-misc", - "wayland-protocols-wlr", + "wayland-protocols-wlr 0.3.1", "wayland-server", "wayland-sys", "winit", @@ -3216,8 +3419,8 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", + "wayland-protocols 0.31.2", + "wayland-protocols-wlr 0.2.0", "wayland-scanner", "xkeysym", ] @@ -3225,7 +3428,7 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#900b938970081cb525dc94ff083d76aa07c60e54" +source = "git+https://github.com/Smithay/smithay.git#234586dbea6bc084cb72a32f164997e47ea36b2b" dependencies = [ "drm", "edid-rs", @@ -3275,9 +3478,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.63" +version = "2.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704" +checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" dependencies = [ "proc-macro2", "quote", @@ -3337,22 +3540,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3401,14 +3604,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit 0.22.14", ] [[package]] @@ -3444,15 +3647,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.13", ] [[package]] @@ -3474,7 +3677,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] @@ -3600,15 +3803,15 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3617,9 +3820,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valuable" @@ -3691,7 +3894,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", "wasm-bindgen-shared", ] @@ -3725,7 +3928,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3738,9 +3941,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" dependencies = [ "cc", "downcast-rs", @@ -3752,9 +3955,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" dependencies = [ "bitflags 2.5.0", "rustix 0.38.34", @@ -3775,9 +3978,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" dependencies = [ "rustix 0.38.34", "wayland-client", @@ -3786,9 +3989,9 @@ dependencies = [ [[package]] name = "wayland-egl" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" +checksum = "18cede1c33845ccd8fcebf7f107595170abf0ad0a28d47c50b444e06019b16e8" dependencies = [ "wayland-backend", "wayland-sys", @@ -3804,18 +4007,29 @@ dependencies = [ "wayland-backend", "wayland-client", "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-protocols-misc" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +checksum = "e76311e1866c955afbbc46ae97e57542acda1dc9b0298358263a8550b5247331" dependencies = [ "bitflags 2.5.0", "wayland-backend", - "wayland-protocols", + "wayland-protocols 0.32.1", "wayland-scanner", "wayland-server", ] @@ -3829,7 +4043,7 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-scanner", ] @@ -3842,16 +4056,28 @@ dependencies = [ "bitflags 2.5.0", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" +dependencies = [ + "bitflags 2.5.0", + "wayland-backend", + "wayland-protocols 0.32.1", "wayland-scanner", "wayland-server", ] [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565" dependencies = [ "proc-macro2", "quick-xml 0.31.0", @@ -3860,9 +4086,9 @@ dependencies = [ [[package]] name = "wayland-server" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e6e4d5c285bc24ba4ed2d5a4bd4febd5fd904451f465973225c8e99772fdb7" +checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559" dependencies = [ "bitflags 2.5.0", "downcast-rs", @@ -3874,9 +4100,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12" dependencies = [ "dlib", "libc", @@ -3898,9 +4124,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -3978,9 +4204,9 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ "windows-targets 0.52.5", ] @@ -4192,46 +4418,50 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.5.0", + "block2", "bytemuck", "calloop 0.12.4", "cfg_aliases", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall", "rustix 0.38.34", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols", + "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -4248,9 +4478,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -4295,12 +4525,12 @@ checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4329,9 +4559,9 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" @@ -4355,6 +4585,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" [[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] name = "yansi-term" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4446,7 +4682,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.63", + "syn 2.0.67", ] [[package]] diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 8799988a4bed7..1f17f089db477 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -19,19 +19,19 @@ rustPlatform.buildRustPackage rec { pname = "niri"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; rev = "v${version}"; - hash = "sha256-MJh0CR2YHJE0GNnxaTcElNMuZUEI0pe9fvC0mfy4484="; + hash = "sha256-EdlOGL9RdO77HnZxv2UpPwrJdFH8qPrPSRtkBBV167s="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "smithay-0.3.0" = "sha256-UzX5pws8yxJhXdKIDzu6uw+PlVLRS9U9ZAfQovKv0w0="; + "smithay-0.3.0" = "sha256-K1lguY6f1mbrfxkDNeLlNAXSM9JC8Jm61MyBIsIYiNs="; }; }; diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt index c494f5c70a473..c934f09efc35a 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt +++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt @@ -1 +1 @@ -2024-05-28 +2024-07-03 diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix index 44ae05865fdd5..70179792da8c7 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix @@ -8,8 +8,8 @@ mkDerivation { pname = "nixfmt"; version = "0.6.0"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/c67a7b65906bd2432730929bd0e4957659c95b8e.tar.gz"; - sha256 = "03f00vwlla6i3m125389h3xjsl5xm07630ahm4w5gqwq1007y3r2"; + url = "https://github.com/nixos/nixfmt/archive/698954723ecec3f91770460ecae762ce590f2d9e.tar.gz"; + sha256 = "1k057nxj58ghid15gd4xi19whaavqgspypk69r0qshb5bhl74nm5"; }; isLibrary = true; isExecutable = true; @@ -22,7 +22,7 @@ mkDerivation { ]; jailbreak = true; homepage = "https://github.com/NixOS/nixfmt"; - description = "Opinionated formatter for Nix"; + description = "The official formatter for Nix code"; license = lib.licenses.mpl20; mainProgram = "nixfmt"; } diff --git a/pkgs/by-name/no/nodemon/package.nix b/pkgs/by-name/no/nodemon/package.nix new file mode 100644 index 0000000000000..03e432628f650 --- /dev/null +++ b/pkgs/by-name/no/nodemon/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "nodemon"; + version = "3.1.4"; + + src = fetchFromGitHub { + owner = "remy"; + repo = "nodemon"; + rev = "v${version}"; + hash = "sha256-bAsq1eoeQ03VhNYgdYJQnZRCxyvt46C+3scihGp+9GU="; + }; + + npmDepsHash = "sha256-cZHfaUWhKZYKRe4Foc2UymZ8hTPrGLzlcXe1gMsW1pU="; + + dontNpmBuild = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)"; + mainProgram = "rtlcss"; + homepage = "https://rtlcss.com"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index 004979ced17bd..357c418a1c273 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-hello"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; rev = "refs/tags/v${version}"; - hash = "sha256-WKDj68hQDPNsqyDG9kB1SklRIl/BSfVl7ebjVKA+33c="; + hash = "sha256-czvKUuSAGEqtjIcIW9mm/LlUsvkGknHbwuXJw5YGT5A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index bc33e030dead3..4321ed571923f 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "21.9.1"; + version = "21.17.2"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QzIKxvG1fg6f4Xk18XBXYirvD1cPmvzwXZoaLhSeuTI="; + hash = "sha256-9+gzjDxkDMOy7r3M6MVepNJ44HJszyzYs5LrM8x3m6Q="; }; - vendorHash = "sha256-N71kM9T8EHh/i8NUSxfPaIRlWk/WADieCkObhVcSyEU="; + vendorHash = "sha256-yArae/1TxiQkNCkElFOHdujWzLCfltSV72I8tQKDyw8="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 94de36bce94d6..93c1198c5b0ea 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -7,6 +7,7 @@ , overrideCC , makeWrapper , stdenv +, addDriverRunpath , cmake , gcc12 @@ -14,8 +15,8 @@ , libdrm , rocmPackages , cudaPackages -, linuxPackages , darwin +, autoAddDriverRunpath , nixosTests , testers @@ -31,13 +32,13 @@ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.1.47"; + version = "0.1.48"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-gxai2ORHABchnmdzjr9oYzk9p21qQjSIxrKt5k356i4="; + hash = "sha256-rMStHUFC88TXIH/1c9bCOU0csnEZHOhWKBlLKarmCmE="; fetchSubmodules = true; }; @@ -101,12 +102,12 @@ let }; cudaToolkit = buildEnv { - name = "cuda-toolkit"; - ignoreCollisions = true; # FIXME: find a cleaner way to do this without ignoring collisions + name = "cuda-merged"; paths = [ - cudaPackages.cudatoolkit - cudaPackages.cuda_cudart - cudaPackages.cuda_cudart.static + (lib.getBin (cudaPackages.cuda_nvcc.__spliced.buildHost or cudaPackages.cuda_nvcc)) + (lib.getLib cudaPackages.cuda_cudart) + (lib.getOutput "static" cudaPackages.cuda_cudart) + (lib.getLib cudaPackages.libcublas) ]; }; @@ -118,16 +119,17 @@ let appleFrameworks.MetalPerformanceShaders ]; - runtimeLibs = lib.optionals enableRocm [ - rocmPath - ] ++ lib.optionals enableCuda [ - linuxPackages.nvidia_x11 - ]; - wrapperOptions = builtins.concatStringsSep " " ([ - "--suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}'" + wrapperOptions = [ + # ollama embeds llama-cpp binaries which actually run the ai models + # these llama-cpp binaries are unaffected by the ollama binary's DT_RUNPATH + # LD_LIBRARY_PATH is temporarily required to use the gpu + # until these llama-cpp binaries can have their runpath patched + "--suffix LD_LIBRARY_PATH : '${addDriverRunpath.driverLink}/lib'" ] ++ lib.optionals enableRocm [ + "--suffix LD_LIBRARY_PATH : '${rocmPath}/lib'" "--set-default HIP_PATH '${rocmPath}'" - ]); + ]; + wrapperArgs = builtins.concatStringsSep " " wrapperOptions; goBuild = @@ -140,10 +142,6 @@ in goBuild ((lib.optionalAttrs enableRocm { ROCM_PATH = rocmPath; CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; -}) // (lib.optionalAttrs enableCuda { - CUDA_LIB_DIR = "${cudaToolkit}/lib"; - CUDACXX = "${cudaToolkit}/bin/nvcc"; - CUDAToolkit_ROOT = cudaToolkit; }) // { inherit pname version src vendorHash; @@ -151,8 +149,11 @@ goBuild ((lib.optionalAttrs enableRocm { cmake ] ++ lib.optionals enableRocm [ rocmPackages.llvm.bintools + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc ] ++ lib.optionals (enableRocm || enableCuda) [ makeWrapper + autoAddDriverRunpath ] ++ lib.optionals stdenv.isDarwin metalFrameworks; @@ -160,6 +161,7 @@ goBuild ((lib.optionalAttrs enableRocm { (rocmLibs ++ [ libdrm ]) ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart + cudaPackages.libcublas ] ++ lib.optionals stdenv.isDarwin metalFrameworks; @@ -188,8 +190,7 @@ goBuild ((lib.optionalAttrs enableRocm { mv "$out/bin/app" "$out/bin/.ollama-app" '' + lib.optionalString (enableRocm || enableCuda) '' # expose runtime libraries necessary to use the gpu - mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped" - makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" ${wrapperOptions} + wrapProgram "$out/bin/ollama" ${wrapperArgs} ''; ldflags = [ diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix index 538e55b8bb25e..726bda8df0397 100644 --- a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix +++ b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix @@ -65,11 +65,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "8.0.0"; + version = "8.1.0"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-YtR2fiARMKw8dOgAPXYM+WFwmhKZRsIIBQYTxppu3F0="; + sha256 = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 1292ff3c27923..90bda880211d3 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; rev = "v${version}"; - hash = "sha256-copxy9fgHTHfF14bh9ddF4eTWx2GP2Mkw3lr+1NKKkI="; + hash = "sha256-tsJILQ+CuVy8LYSixYNJAwSIZtRegrXXvGzvyf7Knd0="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-whddW3ThC/zlttqhV3wf15roaCgp0H/BELWLs9/c5Jc="; + npmDepsHash = "sha256-fB5gvC2sLfH2dJJi+CYyF7PRg+GhZDavhKgeRStaR7I="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. @@ -63,8 +63,10 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ aiohttp + anthropic apscheduler argon2-cffi + authlib bcrypt beautifulsoup4 black @@ -85,6 +87,7 @@ python3.pkgs.buildPythonApplication rec { langchain-community langfuse markdown + openai opencv4 openpyxl pandas @@ -94,6 +97,7 @@ python3.pkgs.buildPythonApplication rec { psycopg2 pydub pyjwt + pymongo pymysql pypandoc pypdf @@ -105,8 +109,10 @@ python3.pkgs.buildPythonApplication rec { pyxlsb rank-bm25 rapidocr-onnxruntime + redis requests sentence-transformers + sqlalchemy unstructured uvicorn validators diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index 053c088a69904..03b23225ada81 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -65,7 +65,7 @@ buildGoModule { mainProgram = "opengist"; homepage = "https://github.com/thomiceli/opengist"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ lf- ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index a0dbd7e10a253..00a4be3e9ece3 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-4PRUBzVy1sb15sYsbitBrOfQnsdbGKoR2OA4EjSc8B8="; + hash = "sha256-htFhNzBuinj9qiTzcW0eia74jvCT/+9b1aLli594JJQ="; }; - cargoHash = "sha256-Jm1181WQfYZPKnu0f2om/hxkJ8Bm5AA/3IwBgZkpF0I="; + cargoHash = "sha256-I2ExtUUM0ZJyhtyzP+IsgiMPMUFVHqPiMHFlvuUMjRc="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index dec178c4031c6..41172f038cc85 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "opensnitch"; - version = "1.6.5.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; + hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI="; }; postPatch = '' diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 0d664860befd3..30d030e96acc7 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-wmIC5Vzne0fe42lCBj+7kNIDG777meUuehJpgmYnPuw="; + hash = "sha256-zHnrb0GU26VCfBeISjp6Ru4Vyul+CRAGMCCgLlJZNTA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/by-name/ou/outguess/package.nix b/pkgs/by-name/ou/outguess/package.nix new file mode 100644 index 0000000000000..1a4bbb44035a3 --- /dev/null +++ b/pkgs/by-name/ou/outguess/package.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub +, stdenv +, lib +, autoreconfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "outguess"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "resurrecting-open-source-projects"; + repo = "outguess"; + rev = finalAttrs.version; + hash = "sha256-yv01jquPTnVk9fd1tqAt1Lxis+ZHZqdG3NiTFxfoXAE="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + configureFlags = [ "--with-generic-jconfig" ]; + + meta = { + description = "Universal steganographic tool that allows the insertion of hidden information into the redundant bits of data sources"; + homepage = "https://github.com/resurrecting-open-source-projects/outguess"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + mainProgram = "outguess"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ov/ovn/generic.nix b/pkgs/by-name/ov/ovn/generic.nix index a584a9ce15f37..c3dbb8f145d9d 100644 --- a/pkgs/by-name/ov/ovn/generic.nix +++ b/pkgs/by-name/ov/ovn/generic.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { popd ''; + configureFlags = [ + "--localstatedir=/var" + ]; + enableParallelBuilding = true; # disable tests due to networking issues and because individual tests can't be skipped easily diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index 64a90eba0aa14..700e55d2db58f 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "paper-age"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "matiaskorhonen"; repo = "paper-age"; rev = "v${version}"; - hash = "sha256-WWRX5St701ja/7wl4beiqD3+ZEEsb9n5N/pbbjdrgDM="; + hash = "sha256-OnCE277CeU9k7NGO0fEF2wI9S1wxOw4lK7iSNp1D+KQ="; }; - cargoHash = "sha256-Ede/BNLTSJPMsu/uYyowuUxBVu1oggiqKcE+vWHCtgU="; + cargoHash = "sha256-2WhzXr5ugPu56BS++MiTNOzcJxSL9F17IM/+yfjkL8k="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index dcbee261c4610..d308a9325425a 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -16,6 +16,7 @@ , blueprint-compiler , libxml2 , libshumate +, gst_all_1 , darwin }: @@ -96,6 +97,10 @@ stdenv.mkDerivation { libadwaita-paperplane tdlib-paperplane rlottie-paperplane + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index dcdb5e6b19f7e..c0de8348e8382 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -13,7 +13,7 @@ , shared-mime-info , itstool , poppler -, gnome +, nautilus , darwin , djvulibre , libspectre @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals supportXPS [ libgxps ] ++ lib.optionals supportNautilus [ - gnome.nautilus + nautilus ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index 8961c70f551cc..b51dac8f237ae 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -23,6 +23,6 @@ homepage = "https://github.com/paratestphp/paratest"; license = lib.licenses.mit; mainProgram = "paratest"; - maintainers = with lib.maintainers; [ patka ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index 6daf6ae1919a2..091c187d04815 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2024_05_23.765eb0b"; + version = "2024_06_24.1ee2eca"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-4i+83uv7fXeK4/0bf1FYGALKwjCqCx51rQAGTOnbrNE="; + hash = "sha256-Q4AbpzJ4Gbu1ArdjzZCf0GmTz0nWZN+kEuhLPT8uPqg="; }; makeFlags = [ diff --git a/pkgs/by-name/pc/pcsx2/darwin.nix b/pkgs/by-name/pc/pcsx2/darwin.nix new file mode 100644 index 0000000000000..20d4ac5a1c390 --- /dev/null +++ b/pkgs/by-name/pc/pcsx2/darwin.nix @@ -0,0 +1,32 @@ +{ + stdenvNoCC, + fetchurl, + pname, + version, + meta, + makeWrapper +}: +stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = fetchurl { + url = "https://github.com/PCSX2/pcsx2/releases/download/v${version}/pcsx2-v${version}-macos-Qt.tar.xz"; + hash = "sha256-QdYV63lrAwYSDhUOy4nB8qL5LfZkrg/EYHtY2smtZuk="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,Applications} + cp -r "PCSX2-v${finalAttrs.version}.app" $out/Applications/PCSX2.app + makeWrapper $out/Applications/PCSX2.app/Contents/MacOS/PCSX2 $out/bin/pcsx2-qt + runHook postInstall + ''; +}) diff --git a/pkgs/by-name/pc/pcsx2/linux.nix b/pkgs/by-name/pc/pcsx2/linux.nix new file mode 100644 index 0000000000000..d26ac5f83616e --- /dev/null +++ b/pkgs/by-name/pc/pcsx2/linux.nix @@ -0,0 +1,136 @@ +{ + cmake, + fetchFromGitHub, + lib, + llvmPackages_17, + callPackage, + cubeb, + curl, + extra-cmake-modules, + fetchpatch, + ffmpeg, + libaio, + libbacktrace, + libpcap, + libwebp, + libXrandr, + lz4, + makeWrapper, + pkg-config, + qt6, + SDL2, + soundtouch, + strip-nondeterminism, + vulkan-headers, + vulkan-loader, + wayland, + zip, + zstd, + + pname, + version, + meta, +}: + +let + shaderc-patched = callPackage ./shaderc-patched.nix { }; + # The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves + pcsx2_patches = fetchFromGitHub { + owner = "PCSX2"; + repo = "pcsx2_patches"; + rev = "b3a788e16ea12efac006cbbe1ece45b6b9b34326"; + sha256 = "sha256-Uvpz2Gpj533Sr6wLruubZxssoXefQDey8GHIDKWhW3s="; + }; + inherit (qt6) + qtbase + qtsvg + qttools + qtwayland + wrapQtAppsHook + ; +in +llvmPackages_17.stdenv.mkDerivation (finalAttrs: { + inherit pname version meta; + + src = fetchFromGitHub { + owner = "PCSX2"; + repo = "pcsx2"; + fetchSubmodules = true; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-WiwnP5yoBy8bRLUPuCZ7z4nhIzrY8P29KS5ZjErM/A4="; + }; + + patches = [ + ./define-rev.patch + # Backport patches to fix random crashes on startup + (fetchpatch { + url = "https://github.com/PCSX2/pcsx2/commit/e47bcf8d80df9a93201eefbaf169ec1a0673a833.patch"; + sha256 = "sha256-7CL1Kpu+/JgtKIenn9rQKAs3A+oJ40W5XHlqSg77Q7Y="; + }) + (fetchpatch { + url = "https://github.com/PCSX2/pcsx2/commit/92b707db994f821bccc35d6eef67727ea3ab496b.patch"; + sha256 = "sha256-HWJ8KZAY/qBBotAJerZg6zi5QUHuTD51zKH1rAtZ3tc="; + }) + ]; + + cmakeFlags = [ + (lib.cmakeBool "DISABLE_ADVANCE_SIMD" true) + (lib.cmakeBool "USE_LINKED_FFMPEG" true) + (lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.rev) + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + strip-nondeterminism + wrapQtAppsHook + zip + ]; + + buildInputs = [ + curl + ffmpeg + libaio + libbacktrace + libpcap + libwebp + libXrandr + lz4 + qtbase + qtsvg + qttools + qtwayland + SDL2 + shaderc-patched + soundtouch + vulkan-headers + wayland + zstd + ] ++ cubeb.passthru.backendLibs; + + installPhase = '' + mkdir -p $out/bin + cp -a bin/pcsx2-qt bin/resources $out/bin/ + + install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png + install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop + + zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/* + strip-nondeterminism $out/bin/resources/patches.zip + ''; + + qtWrapperArgs = + let + libs = lib.makeLibraryPath ([ vulkan-loader ] ++ cubeb.passthru.backendLibs); + in + [ "--prefix LD_LIBRARY_PATH : ${libs}" ]; + + # https://github.com/PCSX2/pcsx2/pull/10200 + # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run + postFixup = '' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/pcsx2-qt \ + --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' + ''; +}) diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix index 89efacebb5159..4454727158a90 100644 --- a/pkgs/by-name/pc/pcsx2/package.nix +++ b/pkgs/by-name/pc/pcsx2/package.nix @@ -1,139 +1,11 @@ -{ cmake -, fetchFromGitHub -, lib -, llvmPackages_17 -, callPackage -, cubeb -, curl -, extra-cmake-modules -, fetchpatch -, ffmpeg -, libaio -, libbacktrace -, libpcap -, libwebp -, libXrandr -, lz4 -, makeWrapper -, pkg-config -, qt6 -, SDL2 -, soundtouch -, strip-nondeterminism -, vulkan-headers -, vulkan-loader -, wayland -, zip -, zstd +{ + stdenv, + lib, + callPackage, }: - let - shaderc-patched = callPackage ./shaderc-patched.nix { }; - # The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves - pcsx2_patches = fetchFromGitHub { - owner = "PCSX2"; - repo = "pcsx2_patches"; - rev = "b3a788e16ea12efac006cbbe1ece45b6b9b34326"; - sha256 = "sha256-Uvpz2Gpj533Sr6wLruubZxssoXefQDey8GHIDKWhW3s="; - }; - inherit (qt6) - qtbase - qtsvg - qttools - qtwayland - wrapQtAppsHook - ; -in -llvmPackages_17.stdenv.mkDerivation (finalAttrs: { pname = "pcsx2"; version = "1.7.5779"; - - src = fetchFromGitHub { - owner = "PCSX2"; - repo = "pcsx2"; - fetchSubmodules = true; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-WiwnP5yoBy8bRLUPuCZ7z4nhIzrY8P29KS5ZjErM/A4="; - }; - - patches = [ - ./define-rev.patch - # Backport patches to fix random crashes on startup - (fetchpatch { - url = "https://github.com/PCSX2/pcsx2/commit/e47bcf8d80df9a93201eefbaf169ec1a0673a833.patch"; - sha256 = "sha256-7CL1Kpu+/JgtKIenn9rQKAs3A+oJ40W5XHlqSg77Q7Y="; - }) - (fetchpatch { - url = "https://github.com/PCSX2/pcsx2/commit/92b707db994f821bccc35d6eef67727ea3ab496b.patch"; - sha256 = "sha256-HWJ8KZAY/qBBotAJerZg6zi5QUHuTD51zKH1rAtZ3tc="; - }) - ]; - - cmakeFlags = [ - (lib.cmakeBool "DISABLE_ADVANCE_SIMD" true) - (lib.cmakeBool "USE_LINKED_FFMPEG" true) - (lib.cmakeFeature "PCSX2_GIT_REV" finalAttrs.src.rev) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - strip-nondeterminism - wrapQtAppsHook - zip - ]; - - buildInputs = [ - curl - ffmpeg - libaio - libbacktrace - libpcap - libwebp - libXrandr - lz4 - qtbase - qtsvg - qttools - qtwayland - SDL2 - shaderc-patched - soundtouch - vulkan-headers - wayland - zstd - ] - ++ cubeb.passthru.backendLibs; - - installPhase = '' - mkdir -p $out/bin - cp -a bin/pcsx2-qt bin/resources $out/bin/ - - install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png - install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop - - zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/* - strip-nondeterminism $out/bin/resources/patches.zip - ''; - - qtWrapperArgs = - let - libs = lib.makeLibraryPath ([ - vulkan-loader - ] ++ cubeb.passthru.backendLibs); - in [ - "--prefix LD_LIBRARY_PATH : ${libs}" - ]; - - # https://github.com/PCSX2/pcsx2/pull/10200 - # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run - postFixup = '' - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/pcsx2-qt \ - --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' - ''; - meta = with lib; { description = "Playstation 2 emulator"; longDescription = '' @@ -143,10 +15,25 @@ llvmPackages_17.stdenv.mkDerivation (finalAttrs: { states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits. ''; + hydraPlatforms = platforms.linux; homepage = "https://pcsx2.net"; - license = with licenses; [ gpl3Plus lgpl3Plus ]; - maintainers = with maintainers; [ hrdinka govanify ]; + license = with licenses; [ + gpl3Plus + lgpl3Plus + ]; + maintainers = with maintainers; [ + hrdinka + govanify + matteopacini + ]; mainProgram = "pcsx2-qt"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + sourceProvenance = + lib.optional stdenv.isDarwin sourceTypes.binaryNativeCode + ++ lib.optional stdenv.isLinux sourceTypes.fromSource; }; -}) +in +if stdenv.isDarwin then + callPackage ./darwin.nix { inherit pname version meta; } +else + callPackage ./linux.nix { inherit pname version meta; } diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix index 152aa513133a1..d7a57caa58fe0 100644 --- a/pkgs/by-name/pe/pegtl/package.nix +++ b/pkgs/by-name/pe/pegtl/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { for creating parsers according to a Parsing Expression Grammar (PEG). ''; license = lib.licenses.boost; - maintainers = with lib.maintainers; [ vigress8 ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix index 6b7231ec8f8e9..6157da0d8a810 100644 --- a/pkgs/by-name/pe/pest/package.nix +++ b/pkgs/by-name/pe/pest/package.nix @@ -21,6 +21,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://pestphp.com"; license = lib.licenses.mit; mainProgram = "pest"; - maintainers = with lib.maintainers; [ patka ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch index f3a34de9304e3..79f44558b3518 100644 --- a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/pkgs/by-name/pe/petsc/filter_mpi_warnings.patch @@ -1,12 +1,12 @@ diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile -index 672a62a..a5fd1c4 100644 +index fa15faad39e..7670e80931e 100644 --- a/src/snes/tutorials/makefile +++ b/src/snes/tutorials/makefile -@@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules +@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 672a62a..a5fd1c4 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 672a62a..a5fd1c4 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,71 +30,83 @@ index 672a62a..a5fd1c4 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \ else \ @@ -57,6 +61,7 @@ runex19_hypre: ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \ else \ @@ -66,6 +71,7 @@ runex19_hypre_cuda: ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \ else \ @@ -75,6 +81,7 @@ runex19_hypre_hip: ${RM} -f ex19_1.tmp runex19_cuda: - -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ + -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \ else \ @@ -84,6 +91,7 @@ runex19_cuda: ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \ else \ @@ -93,6 +101,7 @@ runex19_ml: ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \ else \ @@ -102,6 +111,7 @@ runex19_fieldsplit_mumps: ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \ else \ @@ -111,6 +121,7 @@ runex19_superlu_dist: ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ + echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \ else \ @@ -120,6 +131,7 @@ runex19_suitesparse: ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ - echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ + echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \ else \ +diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile +index d1f047820ec..aab400535dd 100644 +--- a/src/vec/vec/tests/makefile ++++ b/src/vec/vec/tests/makefile +@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules + + runex47: ex47.PETSc + -@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \ + if (${DIFF} output/ex47_1.out ex47_1.tmp) then \ + echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \ + else \ diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix new file mode 100644 index 0000000000000..5a547144b491e --- /dev/null +++ b/pkgs/by-name/pe/petsc/package.nix @@ -0,0 +1,131 @@ +{ + lib, + stdenv, + fetchzip, + darwin, + gfortran, + python3, + blas, + lapack, + mpiSupport ? true, + mpi, # generic mpi dependency + openssh, # required for openmpi tests + petsc-withp4est ? false, + hdf5-support ? false, + hdf5, + metis, + parmetis, + pkg-config, + p4est, + zlib, # propagated by p4est but required by petsc + petsc-optimized ? false, + petsc-scalar-type ? "real", + petsc-precision ? "double", +}: + +# This version of PETSc does not support a non-MPI p4est build +assert petsc-withp4est -> p4est.mpiSupport; + +stdenv.mkDerivation rec { + pname = "petsc"; + version = "3.21.0"; + + src = fetchzip { + url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz"; + hash = "sha256-2J6jtIKz1ZT9qwN8tuYQNBIeBJdE4Gt9cE3b5rTIeF4="; + }; + + inherit mpiSupport; + withp4est = petsc-withp4est; + + strictDeps = true; + nativeBuildInputs = [ + python3 + gfortran + pkg-config + ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh; + buildInputs = [ + blas + lapack + ] ++ lib.optional hdf5-support hdf5 ++ lib.optional withp4est p4est; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace config/install.py \ + --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool + ''; + + # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): + # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. + # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory + # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. + patches = [ ./filter_mpi_warnings.patch ]; + + preConfigure = '' + patchShebangs ./lib/petsc/bin + configureFlagsArray=( + $configureFlagsArray + ${ + if !mpiSupport then + '' + "--with-mpi=0" + '' + else + '' + "--CC=mpicc" + "--with-cxx=mpicxx" + "--with-fc=mpif90" + "--with-mpi=1" + "--with-metis=1" + "--with-metis-dir=${metis}" + "--with-parmetis=1" + "--with-parmetis-dir=${parmetis}" + '' + } + ${lib.optionalString withp4est '' + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=-L${zlib}/lib -lz" + ''} + ${lib.optionalString hdf5-support '' + "--with-hdf5=1" + "--with-hdf5-fortran-bindings=1" + "--with-hdf5-lib=-L${hdf5}/lib -lhdf5" + "--with-hdf5-include=${hdf5.dev}/include" + ''} + "--with-blas=1" + "--with-lapack=1" + "--with-scalar-type=${petsc-scalar-type}" + "--with-precision=${petsc-precision}" + ${lib.optionalString petsc-optimized '' + "--with-debugging=0" + COPTFLAGS='-O3' + FOPTFLAGS='-O3' + CXXOPTFLAGS='-O3' + CXXFLAGS='-O3' + ''} + ) + ''; + + hardeningDisable = lib.optionals (!petsc-optimized) [ + "fortify" + "fortify3" + ]; + + configureScript = "python ./configure"; + + enableParallelBuilding = true; + + # This is needed as the checks need to compile and link the test cases with + # -lpetsc, which is not available in the checkPhase, which is executed before + # the installPhase. The installCheckPhase comes after the installPhase, so + # the library is installed and available. + doInstallCheck = true; + installCheckTarget = "check_install"; + + meta = with lib; { + description = "Portable Extensible Toolkit for Scientific computation"; + homepage = "https://petsc.org/release/"; + license = licenses.bsd2; + maintainers = with maintainers; [ cburstedde ]; + }; +} diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 535eff92fb229..6b15867215e9a 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-+2pS3KG5wwP7bnaV+x8WxvDvQuXqmiMbuLScMNLqBtI="; + hash = "sha256-366UdWw2lJ30LhPR4Q0Iym1BTcgauEwwsGzn6Wew9gk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 80dc6f2e6f895..6e22a98ce2ec1 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -30,6 +30,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://github.com/phpactor/phpactor"; license = lib.licenses.mit; mainProgram = "phpactor"; - maintainers = [ lib.maintainers.patka ] ++ lib.teams.php.members; + maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 34ab9d229721b..dff878c15d5f6 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://phpunit.de"; license = lib.licenses.bsd3; mainProgram = "phpunit"; - maintainers = with lib.maintainers; [ onny patka ] ++ lib.teams.php.members; + maintainers = with lib.maintainers; [ onny ] ++ lib.teams.php.members; }; }) diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix new file mode 100644 index 0000000000000..fe9376e9d632c --- /dev/null +++ b/pkgs/by-name/ph/phraze/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "phraze"; + version = "0.3.11"; + + src = fetchFromGitHub { + owner = "sts10"; + repo = "phraze"; + rev = "v${version}"; + hash = "sha256-1tvFVwTvtjAXVfCObdL3tGq50q4zouchNAuMo7euZ3g="; + }; + + doCheck = true; + + cargoHash = "sha256-q3nkNBEiisGp+ElSXZnT4x6P0Sm5sM2R9cpzpaJ/UU4="; + + meta = { + description = "Generate random passphrases"; + homepage = "https://github.com/sts10/phraze"; + changelog = "https://github.com/sts10/phraze/releases/tag/v${version}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ x123 ]; + mainProgram = "phraze"; + }; +} diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 998514b3f9815..8337b0f694b4e 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -8,13 +8,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-06-13"; + version = "8.2-unstable-2024-07-01"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "a0e818855daba0d2f11a298f7fd238f8a6049167"; - hash = "sha256-w1SWYhPfFGX2EumEe8UBZA3atW4jvW54GsMYLGg59Ys="; + rev = "b8fe9323e7606709d692976a7fe7d2455b328bc6"; + hash = "sha256-bXeoWg1ZukXv+6ZNeRc8gGNsbtBztyW5lpfK0lQK+DE="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix new file mode 100644 index 0000000000000..c703840919344 --- /dev/null +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, kdePackages +}: +stdenv.mkDerivation (finalAttrs: { + pname = "plasmusic-toolbar"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "ccatterina"; + repo = "plasmusic-toolbar"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rThoh7NkpWlKUNOsAY9WEt1F1MFoKliNYCB9ySfKYy8="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/plasma/plasmoids/plasmusic-toolbar + cp -r src/* $out/share/plasma/plasmoids/plasmusic-toolbar + runHook postInstall + ''; + + meta = { + description = "KDE Plasma widget that shows currently playing song information and provide playback controls."; + homepage = "https://github.com/ccatterina/plasmusic-toolbar"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + inherit (kdePackages.kwindowsystem.meta) platforms; + }; +}) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index 84584bf421885..2306bee07642d 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "24.1.6"; + version = "24.1.7"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-gGfDsAqg0PkORrOEvBWLpKgLv5a+M9Rj+oC+jF1gYqA="; + hash = "sha256-HVAQXDfj/5UoOGvgrOW09xFeVv4MF/wXqxtRdwZAqso="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 66da65842d31d..7771eec81d2b7 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne moni ckie ]; + maintainers = with maintainers; [ afldcr Br1ght0ne moni ]; mainProgram = "polybar"; platforms = platforms.linux; }; diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index 513227e5637c2..404d64790992f 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.3.1"; + version = "3.4.0"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-T0IHpfMfx4P84RyBLtaYNead6a7cID2cUYwkyNnYMgc="; + hash = "sha256-6feS9ougTlunkIr1WRUYieR4O8vHN1++VdfX5DreWFg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 784976d06eaf8..631f72672ea4f 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -99,6 +99,7 @@ python.pkgs.buildPythonApplication rec { "celery" "css-inline" "cssutils" + "django-compressor" "django-csp" "django-filter" "django-hierarkey" diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index f4e744af6748f..fa30d5c1a17d2 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -34,17 +34,19 @@ let }; pretix-plugin-build = self.callPackage ./plugin-build.nix { }; + + sentry-sdk = super.sentry-sdk_2; }; }; pname = "pretix"; - version = "2024.5.0"; + version = "2024.6.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-dLzCugbRQSGuOwe99a3WLMffisyvYWNRdSdcdW9knjY="; + hash = "sha256-erI3Ai6zwNSvMiF3YKfnU9ePb9R92rfi5rsxfAOh6EQ="; }; npmDeps = buildNpmPackage { @@ -52,7 +54,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-SEgAC3dmnxG1xM9QZQ/e+6NFOwXU3tXlbfZCzrAMFO0="; + npmDepsHash = "sha256-//CLPnx5eUxIHIUGc7x2UF8qsfAYRtvHbHXSDNtI/eI="; dontBuild = true; @@ -97,7 +99,8 @@ python.pkgs.buildPythonApplication rec { --replace-fail "protobuf==5.27.*" protobuf \ --replace-fail "pycryptodome==3.20.*" pycryptodome \ --replace-fail "python-dateutil==2.9.*" python-dateutil \ - --replace-fail "requests==2.32.*" "requests" \ + --replace-fail "requests==2.31.*" "requests" \ + --replace-fail "sentry-sdk==2.5.*" "sentry-sdk>=2" \ --replace-fail "stripe==7.9.*" stripe ''; @@ -226,6 +229,13 @@ python.pkgs.buildPythonApplication rec { disabledTests = [ # unreliable around day changes "test_order_create_invoice" + + # outdated translation files + # https://github.com/pretix/pretix/commit/c4db2a48b6ac81763fa67475d8182aee41c31376 + "test_different_dates_spanish" + "test_same_day_spanish" + "test_same_month_spanish" + "test_same_year_spanish" ]; preCheck = '' diff --git a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix index 179acfe520ace..49ca4c9d6d840 100644 --- a/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix +++ b/pkgs/by-name/pr/prometheus-jmx-javaagent/package.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation ( in { pname = "jmx-prometheus-javaagent"; - version = "0.20.0"; + version = "1.0.1"; src = fetchurl { url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_javaagent/${finalAttrs.version}/${jarName}"; - sha256 = "sha256-i2ftQEhdR1ZIw20R0hRktIRAb4X6+RKzNj9xpqeGEyA="; + sha256 = "sha256-fWH3N/1mFhDMwUrqeXZPqh6pSjQMvI8AKbPS7eo9gME="; }; dontUnpack = true; diff --git a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix index 1c9098997010c..217449b85bb40 100644 --- a/pkgs/by-name/pr/prometheus-squid-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-squid-exporter/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "squid-exporter"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "boynux"; repo = "squid-exporter"; rev = "v${version}"; - sha256 = "sha256-43f6952IqUHoB5CN0p5R5J/sMKbTe2msF9FGqykwMBo="; + sha256 = "sha256-low1nIL7FbIYfIP7KWPskAQ50Hh+d7JI+ryYoR+mP10="; }; - vendorHash = null; + vendorHash = "sha256-0BNhjNveUDd0+X0do4Md58zJjXe3+KN27MPEviNuF3g="; meta = { description = "Squid Prometheus exporter"; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 3afa04ec788a7..d036124842ff6 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-IqXxjR+M1OCRKUA2HCT6WQvdBMOa0efT8m+drhyQCoE="; + hash = "sha256-tzDh8LMxIRYJszgUvAMEWWiSjasSnyz2cOrmNnmaLOg="; }; - cargoHash = "sha256-NnTiT1jLMo9EfYau+U0FiAC+V67GnoI90vSsotwniio="; + cargoHash = "sha256-JxJlOcTqjQP5MA4em+8jArr0ewCbVibQvLjr+kzn7EM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/pr/protoc-gen-rust/package.nix b/pkgs/by-name/pr/protoc-gen-rust/package.nix index bba32dd81a4ed..72b8652bf826a 100644 --- a/pkgs/by-name/pr/protoc-gen-rust/package.nix +++ b/pkgs/by-name/pr/protoc-gen-rust/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "protoc-gen-rust"; - version = "3.2.0"; + version = "3.5.0"; src = fetchCrate { inherit version; pname = "protobuf-codegen"; - sha256 = "sha256-9Rf7GI/qxoqlISD169TJwUVAdJn8TpxTXDNxiQra2UY="; + hash = "sha256-yGZ4auZHGtcsN6n4/FEzabsSXproyhNTJHIwujt7ijg="; }; - cargoSha256 = "sha256-i1ZIEbU6tw7xA1w+ffD/h1HIkOwVep9wQJys9Bydvv0="; + cargoHash = "sha256-RO3kVYkvHw8kwLaRfANtGtz88knjJ8HtmU3i0xgIDMY="; cargoBuildFlags = ["--bin" pname]; diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 186943dd9dca1..205c21c7ed36f 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-7"; + version = "GE-Proton9-9"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-/FXdyPuCe6rD5HoMOHPVlwRXu3DMJ3lEOnRloYZMA8s="; + hash = "sha256-sUjC6ByO8oeRhg3aZLSDJTc2GstdAdXJOddS37UkkL8="; }; outputs = [ "out" "steamcompattool" ]; diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index 18a9da1fc7cf1..6c08b924f8cda 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -15,14 +15,14 @@ }: let - version = "46.3"; + version = "46.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; rev = version; - hash = "sha256-DKZgnistOv6eFWtqYPtMc1tQJWovCWIqrqGgs9uWu5k="; + hash = "sha256-FIq05EDOEi0qx6s5i5a2T9bacVUMQWe0nl6xUp6CY1s="; }; vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: { diff --git a/pkgs/by-name/py/pyzy/package.nix b/pkgs/by-name/py/pyzy/package.nix new file mode 100644 index 0000000000000..5fdcae56c47b5 --- /dev/null +++ b/pkgs/by-name/py/pyzy/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + python3, + glib, + libuuid, + sqlite, + nix-update-script, +}: + +stdenv.mkDerivation { + pname = "pyzy"; + version = "1.1-unstable-2023-02-28"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "pyzy"; + rev = "ec719d053bd491ec64fe68fe0d1699ca6039ad80"; + hash = "sha256-wU7EgP/CPNhBx9N7mOu0WdnoLazzpQtbRxmBKrTUbKM="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3 + ]; + + buildInputs = [ + glib + libuuid + sqlite + ]; + + postPatch = '' + patchShebangs ./data/db/android/create_db.py + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = with lib; { + description = "The Chinese PinYin and Bopomofo conversion library"; + homepage = "https://github.com/openSUSE/pyzy"; + license = licenses.lgpl21; + maintainers = with maintainers; [ azuwis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index 1b4c4a29ac2e2..cc017374317c0 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.10.10"; + version = "0.10.13"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-2gUvnQjAA0nTeJL4IbsfCmeSD+mGKjywJCCi914f5mM="; + sha256 = "sha256-8j9yn76yGzhqOgQsxpa9TsXU/19IpmZH8PsK2gvybls="; }; - cargoHash = "sha256-M5G5f+aycpIbFaPbkUNalMK3if1PIAXD7MaNsLzdvI4="; + cargoHash = "sha256-RPiwpNY3J07HMORfK+kDiMk1eagvIjm9B5nnuXJp0wk="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index adc40aeea30d5..a0f4a4172d495 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.11.3"; + version = "3.12.0"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-cZZoGU7v3SKe3dvYUR5T8jKwAkLnDJt+SWYzgMmdJwA="; + hash = "sha256-bausbHHKyX6ITYz1a0xb2AxPeyJlyp/ddzCRs1nYuOc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index 5349581aab119..1f8e0cf07118c 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -6,6 +6,7 @@ cdrtools, curl, gawk, + glxinfo, gnugrep, gnused, jq, @@ -13,7 +14,7 @@ pciutils, procps, python3, - qemu, + qemu_full, socat, spice-gtk, swtpm, @@ -28,7 +29,6 @@ quickemu, testers, installShellFiles, - fetchpatch2, }: let runtimePaths = [ @@ -42,27 +42,29 @@ let pciutils procps python3 - qemu + qemu_full socat swtpm - usbutils util-linux unzip - xdg-user-dirs xrandr zsync + ] ++ lib.optionals stdenv.isLinux [ + glxinfo + usbutils + xdg-user-dirs ]; in stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; - version = "4.9.4-unstable-2024-05-28"; + version = "4.9.5"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; - rev = "d78255b097b599e8ab3713cb61c4085cc45f5a95"; # TODO: return to version on next release - hash = "sha256-fF306CdGqKM+779OLm0NNyqPBtm7TuU7UN/NanT12y8="; + rev = finalAttrs.version; + hash = "sha256-UlpNujF2E8H1zcWTen8D29od60pY8FaGueviT0iwupQ="; }; postPatch = '' @@ -71,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: { -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.firmware}","${OVMF.variables}" |' \ -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \ -e 's/Icon=.*qemu.svg/Icon=qemu/' \ + -e 's,\[ -x "\$(command -v smbd)" \],true,' \ quickemu ''; @@ -97,13 +100,13 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests = testers.testVersion { - version = "4.9.5"; # required for passing tests, TODO: remove when release bump package = quickemu; }; meta = { description = "Quickly create and run optimised Windows, macOS and Linux virtual machines"; homepage = "https://github.com/quickemu-project/quickemu"; + changelog = "https://github.com/quickemu-project/quickemu/releases/tag/${finalAttrs.version}"; mainProgram = "quickemu"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix index f0d353e7f6fbc..887c482e6c86f 100644 --- a/pkgs/by-name/qu/quickjs-ng/package.nix +++ b/pkgs/by-name/qu/quickjs-ng/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "quickjs-ng"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "quickjs-ng"; repo = "quickjs"; rev = "v${finalAttrs.version}"; - hash = "sha256-mo+YBhaCqGRWfVRvZCD0iB2pd/DsHsfWGFeFxwwyxPk="; + hash = "sha256-4CC7IxA5t+L99H4Rvkx0xkXFHuqNP3HTmS46JEuy7Vs="; }; outputs = [ "bin" "out" "dev" "doc" "info" ]; @@ -29,6 +29,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_STATIC_QJS_EXE" stdenv.hostPlatform.isStatic) ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + "-Wno-error=stringop-overflow" + ]); + postInstall = '' (cd ../doc makeinfo --output quickjs.info quickjs.texi diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 46a35fda34ca8..27c2a15cea153 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -13,17 +13,17 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-httpd"; - version = "0.11.0"; + version = "0.12.1"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; - hash = "sha256-XMEO+L362uaPUr25YUkMh41a2BcKEy8bgXfwKlvBtnQ="; + hash = "sha256-7576IQRf6Q750LWPon4Iau+YZddSU77VV8lC9C1UozM="; sparseCheckout = [ "radicle-httpd" ]; }; sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-WdgPL6X3FMxHW6OVoTkrbo0azAxp35UzGMcTJ5pNnkI="; + cargoHash = "sha256-3LQhbQxvJ1onGSEzc93Ww79FQCXAB54XcekHg+gHY2Q="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/ra/rainbowcrack/package.nix b/pkgs/by-name/ra/rainbowcrack/package.nix new file mode 100644 index 0000000000000..bc138dbc9c743 --- /dev/null +++ b/pkgs/by-name/ra/rainbowcrack/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + alglib, + unzip, + autoPatchelfHook, +}: + +stdenv.mkDerivation rec { + pname = "rainbowcrack"; + version = "1.8"; + + src = fetchurl { + url = "http://project-rainbowcrack.com/rainbowcrack-${version}-linux64.zip"; + hash = "sha256-xMC9teHiDvBY/VHV63TsNQjdcuLqHGeXUyjHvRTO9HQ="; + }; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + ]; + + buildInputs = [ stdenv.cc.cc.lib ]; + + dontConfigure = true; + + dontBuild = true; + + unpackPhase = '' + mkdir -p $out/{bin,share/rainbowcrack} + unzip $src -d $out || true + ''; + + installPhase = '' + install -Dm644 $out/rainbowcrack-1.8-linux64/*.txt $out/share/rainbowcrack + install -Dm755 $out/rainbowcrack-1.8-linux64/rt* $out/rainbowcrack-1.8-linux64/rcrack $out/bin + chmod +x $out/bin/* + rm -rf $out/rainbowcrack-1.8-linux64 + ''; + + runtimeDependencies = [ alglib ]; + + meta = { + description = "Rainbow table generator used for password cracking"; + homepage = "http://project-rainbowcrack.com"; + maintainers = with lib.maintainers; [ tochiaha ]; + license = lib.licenses.unfree; + mainProgram = "rcrack"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux64" ]; + }; +} diff --git a/pkgs/by-name/ra/raze/package.nix b/pkgs/by-name/ra/raze/package.nix new file mode 100644 index 0000000000000..8739aa1108a1b --- /dev/null +++ b/pkgs/by-name/ra/raze/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + SDL2, + zmusic, + libvpx, + pkg-config, + makeWrapper, + bzip2, + gtk3, + fluidsynth, + openal, + libGL, + vulkan-loader, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "raze"; + version = "1.10.2"; + + src = fetchFromGitHub { + owner = "ZDoom"; + repo = "Raze"; + rev = finalAttrs.version; + hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g="; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse HEAD > COMMIT + rm -rf .git + ''; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + makeWrapper + ]; + + buildInputs = [ + SDL2 + zmusic + libvpx + bzip2 + gtk3 + fluidsynth + openal + libGL + vulkan-loader + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release") + (lib.cmakeBool "DYN_GTK" false) + (lib.cmakeBool "DYN_OPENAL" false) + ]; + + postPatch = '' + substituteInPlace tools/updaterevision/gitinfo.h.in \ + --replace-fail "@Tag@" "${finalAttrs.version}" \ + --replace-fail "@Hash@" "$(cat COMMIT)" \ + --replace-fail "@Timestamp@" "1970-01-01 00:00:01 +0000" + ''; + + postInstall = '' + mv $out/bin/raze $out/share/raze + makeWrapper $out/share/raze/raze $out/bin/raze + install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/pixmaps/org.zdoom.Raze.png + install -Dm644 ../source/platform/posix/org.zdoom.Raze.desktop $out/share/applications/org.zdoom.Raze.desktop + install -Dm644 ../soundfont/raze.sf2 $out/share/raze/soundfonts/raze.sf2 + ''; + + meta = { + description = "Build engine port backed by GZDoom tech"; + longDescription = '' + Raze is a fork of Build engine games backed by GZDoom tech and combines + Duke Nukem 3D, Blood, Redneck Rampage, Shadow Warrior and Exhumed/Powerslave + in a single package. It is also capable of playing Nam and WW2 GI. + ''; + homepage = "https://github.com/ZDoom/Raze"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ qubitnano ]; + mainProgram = "raze"; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 9d2f64c9b22b2..8b92529936e31 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-nNMcZyJAvqxVSoytmfSqsfk1yVzzZ5aIOj72L+jFAAM="; + hash = "sha256-ymqglANM4vIIBC/lCnnLbYvAqJzdxX+lZGw4IB5O1sE="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); - cargoHash = "sha256-3+w+pTws8WjrUqIWYGbE2V438mVUUyrjBH9mHI8uRMQ="; + cargoHash = "sha256-88DSK0E1Wu9RMYJsbsnnieCorJZ50TRF7Fm/uCSOYHU="; RUSTFLAGS = "--cfg tokio_unstable"; diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 3398236ec6a57..ea319d0d8b193 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { src = let src-tarball = requireFile { name = "rcu-d${version}-source.tar.gz"; - sha256 = "1njsfj4pfqh4c9gppkdlkkfba31v186wjz3zm94adhhpdwzx2ybb"; + sha256 = "15559537bjrviq5n87yz4q6n3y3l3bwip8rxg34zf0w9zmr4zmqn"; url = "http://www.davisr.me/projects/rcu/"; }; in runCommand "${src-tarball.name}-unpacked" {} '' diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix index 76a05dcea107e..a7a313b367547 100644 --- a/pkgs/by-name/re/reactphysics3d/package.nix +++ b/pkgs/by-name/re/reactphysics3d/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "reactphysics3d"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "DanielChappuis"; repo = "reactphysics3d"; rev = "v${finalAttrs.version}"; - hash = "sha256-LWBnrqDFhpzN/XUEGniZeViDq3R1MtmuU5CMCQ59VOY="; + hash = "sha256-j57wzqAmBV/pK7PPUDXV6ciOCQVs2gX+BaGHk4kLuUI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 216b3f08a25c5..3497bc9ba4d13 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.34.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; rev = "refs/tags/v${version}"; - hash = "sha256-JpuCX2ae9me+zHxQj5jqQlgDci2NV+TEVUAqnuTn3cA="; + hash = "sha256-W1v7iOE60/6UyZSHQW+L+wHCoKnKUNb3kpm4LVLPZ6c="; }; - cargoHash = "sha256-gkRblCHUFiprZeYtu43GIGBZqCq5l/HEGaQN91XbfSs="; + cargoHash = "sha256-3NQWiu/nTtHrivYL1pgxqQxEuIW0xfjxwK0ZEa2y1Kk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 2d23539271eea..8bdcefaac3b49 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-qGjFueL05f7DgDa0/B+w1Ix2tRx7PicMneub2sWJ7Gw="; + hash = "sha256-6aPNgqem3nG+rPJmxMyjqYPm5mE+93h/uXKCuiUeLxI="; }; - npmDepsHash = "sha256-pO1ewVInuPCLDk2V4HRqOCFmT1VTVa/qRkJ5rxREWMU="; + npmDepsHash = "sha256-J+nlY+FKZqwhj4JyuyReW/UoAMX/eouuOAZ2WCzW2VA="; npmBuildScript = "prepare"; diff --git a/pkgs/by-name/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 6072f05e06c19..e0e55bb8c515d 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ricochet-refresh"; - version = "3.0.24"; + version = "3.0.25"; src = fetchFromGitHub { owner = "blueprint-freespeech"; repo = "ricochet-refresh"; rev = "v${finalAttrs.version}-release"; fetchSubmodules = true; - hash = "sha256-xz1cyNQgmXUIZc56OHwWZCGVNpp7CFFyCd0EvAas4zw="; + hash = "sha256-MXbsNrF3y2DimXUuf6XbqqCxcNsTGfNHSAMstdX1MoU="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index 52adbc5387d03..25d18248d5bb8 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -12,6 +12,7 @@ copyDesktopItems, makeDesktopItem, electron, + darwin, }: let @@ -31,6 +32,8 @@ let }; platformInfo = platformInfos.${stdenv.system}; + + electronDist = electron + (if stdenv.isDarwin then "/Applications" else "/libexec/electron"); in buildNpmPackage rec { pname = "ride"; @@ -83,22 +86,33 @@ buildNpmPackage rec { popd ''; - nativeBuildInputs = [ - zip - makeWrapper - copyDesktopItems - ]; + nativeBuildInputs = + [ + zip + makeWrapper + ] + ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ] + ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + # Fix error: no member named 'aligned_alloc' in the global namespace + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0" + ) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; + npmBuildFlags = platformInfo.buildCmd; # This package uses electron-packager instead of electron-builder # Here, we create a local cache of electron zip-files, so electron-packager can copy from it postConfigure = '' mkdir local-cache - cp -r --no-preserve=all ${electron}/libexec/electron electron - pushd electron + + # electron files need to be writable on Darwin + cp -r ${electronDist} electron-dist + chmod -R u+w electron-dist + + pushd electron-dist zip -qr ../local-cache/electron-v${electron.version}-${platformInfo.zipSuffix}.zip * popd ''; @@ -106,19 +120,27 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - install -Dm644 D.png $out/share/icons/hicolor/64x64/apps/ride.png - install -Dm644 D.svg $out/share/icons/hicolor/scalable/apps/ride.svg - pushd _/ride*/* install -Dm644 ThirdPartyNotices.txt -t $out/share/doc/ride - mkdir -p $out/share/ride - cp -r locales resources{,.pak} $out/share/ride - makeWrapper ${lib.getExe electron} $out/bin/ride \ - --add-flags $out/share/ride/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --inherit-argv0 + ${lib.optionalString (!stdenv.isDarwin) '' + install -Dm644 $src/D.png $out/share/icons/hicolor/64x64/apps/ride.png + install -Dm644 $src/D.svg $out/share/icons/hicolor/scalable/apps/ride.svg + + mkdir -p $out/share/ride + cp -r locales resources{,.pak} $out/share/ride + makeWrapper ${lib.getExe electron} $out/bin/ride \ + --add-flags $out/share/ride/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + ''} + + ${lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r Ride-*.app $out/Applications + makeWrapper $out/Applications/Ride-*.app/Contents/MacOS/Ride-* $out/bin/ride + ''} popd @@ -141,7 +163,6 @@ buildNpmPackage rec { ]; meta = { - broken = stdenv.isDarwin; changelog = "https://github.com/Dyalog/ride/releases/tag/${src.rev}"; description = "Remote IDE for Dyalog APL"; homepage = "https://github.com/Dyalog/ride"; diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 8709e0b4de992..37d7c8c889b29 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-06-27"; + version = "0-unstable-2024-07-02"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "86b2f74a24fdf2957f6aad28fb999fa6a2e43e82"; - hash = "sha256-ns6j8ChJpV4ryxajGmdbRlJj3eL8qRIYzrD4VPfTYDY="; + rev = "1675a26fbf06d3085759ccd63b102b3ce8583c3a"; + hash = "sha256-4GPEufI5j03jCN3N8AUtQIKAsFjPi4DbfNcdoMnbNQ0="; }; dontConfigure = true; diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix new file mode 100644 index 0000000000000..f049049279d5c --- /dev/null +++ b/pkgs/by-name/ro/rotonda/package.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "rotonda"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "NLnetLabs"; + repo = "rotonda"; + rev = "v${version}"; + hash = "sha256-bhuVzoEgDrfj4z2rfD+2agkXKNLZXN/MA+AxmEaeuLk="; + }; + + cargoHash = "sha256-0i1dFMPNUAMgTdZ+f9fg0DvvhkpCmlPOjYoyFvHT4v4="; + + meta = with lib; { + description = "Rotonda - composable, programmable BGP Engine"; + homepage = "https://github.com/NLnetLabs/rotonda"; + changelog = "https://github.com/NLnetLabs/rotonda/blob/${src.rev}/Changelog.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ _0x4A6F ]; + mainProgram = "rotonda"; + }; +} diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 8a88b4b202f75..50e4a41c35772 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -32,10 +32,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "16614-5b973448b"; - rpcs3Version = "0.0.32-16614-5b973448b"; - rpcs3Revision = "5b973448bf75a239f34fd9c7698c8a02b04e2ea9"; - rpcs3Hash = "sha256-6rDHOK3KZkLaDcdG6dFlicWLFeuQUhCiRG1Y0grOvmA="; + rpcs3GitVersion = "16648-71524271e"; + rpcs3Version = "0.0.32-16648-71524271e"; + rpcs3Revision = "71524271e948316d57515422bd0da0159a55d24d"; + rpcs3Hash = "sha256-uKzikzl33EBOjmLU3IML6CIfQbRaOs4NYZylSOVo9Dg="; inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/ry/rygel/add-option-for-installation-sysconfdir.patch index 5204e3518aba7..5204e3518aba7 100644 --- a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/pkgs/by-name/ry/rygel/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/by-name/ry/rygel/package.nix index 7c93bc8668e4d..66d2a5ffae8c4 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "rygel"; - attrPath = "gnome.rygel"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/sa/sarasa-gothic/package.nix b/pkgs/by-name/sa/sarasa-gothic/package.nix index ff1447e49203f..17217e5f8e56d 100644 --- a/pkgs/by-name/sa/sarasa-gothic/package.nix +++ b/pkgs/by-name/sa/sarasa-gothic/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sarasa-gothic"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip"; - hash = "sha256-1LWooboM+vPbft1+Gvg9Cp24RFEeJPG4yvNiexRi/pg="; + hash = "sha256-jN50v0N7wSL/F6qOSjp+nRmooR/mNiebsbe4Iy5YmeM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix index 830f6deb232f1..ab0516dd72eed 100644 --- a/pkgs/by-name/sc/scion/package.nix +++ b/pkgs/by-name/sc/scion/package.nix @@ -35,6 +35,8 @@ buildGoModule { doCheck = true; + tags = [ "sqlite_mattn" ]; + passthru.tests = { inherit (nixosTests) scion-freestanding-deployment; }; diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/by-name/se/seahorse/package.nix index 4cbc455c3da94..2ebc5bae4d0b2 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/by-name/se/seahorse/package.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index 7a149ca92a74e..cb2341796cc08 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation { description = "Collection of multiple types of lists used during security assessments, collected in one place"; homepage = "https://github.com/danielmiessler/seclists"; license = licenses.mit; - maintainers = with maintainers; [ tochiaha janik pamplemousse ]; + maintainers = with maintainers; [ tochiaha pamplemousse ]; }; } diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 15d6b6f7caa67..02a94f86f5633 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -8,7 +8,7 @@ }: let pname = "serpl"; - version = "0.1.26"; + version = "0.1.30"; in rustPlatform.buildRustPackage { inherit pname version; @@ -16,12 +16,12 @@ rustPlatform.buildRustPackage { owner = "yassinebridi"; repo = "serpl"; rev = version; - hash = "sha256-ppF74VI0ceB4G/RLTa1phEy+tQ34r4hOMxqlK7YeLo0="; + hash = "sha256-ZltOhlx9aPD5vO9eTpoXWR6qXUwB+jW+tATkwX9UlIU="; }; nativeBuildInputs = [ makeWrapper ]; - cargoHash = "sha256-/TnuRRzeCPp8pqa/soGV0b3ZYp0cCbt3un6SjatSGp0="; + cargoHash = "sha256-FDS9JOmOtWOajB1tSd7QyW/KutRujs+3KjXxlNktrDM="; postFixup = '' # Serpl needs ripgrep to function properly. diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/by-name/si/simple-scan/package.nix index e7f2954ca39f4..e7f2954ca39f4 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/by-name/si/simple-scan/package.nix diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index d262dbd5a50d2..3e433c2d88f6e 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-EYoUsxJgG9xqXtjys0InJJaqvX1XXcef9PYQ3nZPNuo="; + hash = "sha256-s5gyamNQk79+FEO2JlHIhlI9LK6M16Mf+D9qz9J67qw="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 7e34a1041db13..91b050403a016 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -1,90 +1,62 @@ -let - artifacts = [ "shell" "lua" "font" ]; -in -{ lib -, stdenvNoCC -, fetchurl -, common-updater-scripts -, curl -, jq -, writeShellScript -, artifactList ? artifacts +{ + fetchFromGitHub, + lib, + pnpm, + stdenvNoCC, + nodejs, + nix-update-script, }: -lib.checkListOfEnum "sketchybar-app-font: artifacts" artifacts artifactList - stdenvNoCC.mkDerivation - (finalAttrs: - let - selectedSources = map (artifact: builtins.getAttr artifact finalAttrs.passthru.sources) artifactList; - in - { - pname = "sketchybar-app-font"; - version = "2.0.19"; - srcs = selectedSources; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "sketchybar-app-font"; + version = "2.0.19"; - unpackPhase = '' - runHook preUnpack + src = fetchFromGitHub { + owner = "kvndrsslr"; + repo = "sketchybar-app-font"; + rev = "v2.0.19"; + hash = "sha256-4D3ONeGSvFYdeD3alzXlDxyLh6EyIC+lr4A6t7YWBaw="; + }; - for s in $selectedSources; do - b=$(basename $s) - cp $s ''${b#*-} - done + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-u0Rr086p6gotS+p9365+P8uKEqxDNGnWCsZDCaj8eEE="; + }; - runHook postUnpack - ''; + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; - installPhase = '' - runHook preInstall + buildPhase = '' + runHook preBuild - '' + lib.optionalString (lib.elem "font" artifactList) '' - install -Dm644 ${finalAttrs.passthru.sources.font} "$out/share/fonts/truetype/sketchybar-app-font.ttf" + pnpm i + pnpm run build - '' + lib.optionalString (lib.elem "shell" artifactList) '' - install -Dm755 ${finalAttrs.passthru.sources.shell} "$out/bin/icon_map.sh" + runHook postBuild + ''; - '' + lib.optionalString (lib.elem "lua" artifactList) '' - install -Dm644 ${finalAttrs.passthru.sources.lua} "$out/lib/sketchybar-app-font/icon_map.lua" + installPhase = '' + runHook preInstall - runHook postInstall - ''; + install -Dm644 dist/sketchybar-app-font.ttf "$out/share/fonts/truetype/sketchybar-app-font.ttf" + install -Dm755 dist/icon_map.sh "$out/bin/icon_map.sh" + install -Dm644 dist/icon_map.lua "$out/lib/sketchybar-app-font/icon_map.lua" - passthru = { - sources = { - font = fetchurl { - url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-AH4Zkaccms1gNt7ZHZRHYPOx/iLpbcA4MiyBStHRDfU="; - }; - lua = fetchurl { - url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/icon_map.lua"; - hash = "sha256-AGcHBgOZY2EBR0WEfaQhEsTRdo8QfEawx6Q2rdBuKIg="; - }; - shell = fetchurl { - url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/icon_map.sh"; - hash = "sha256-fdKnweYF92zCLVBVXTjLWK9vdzMD8FvOHjEo2vqPbhQ="; - }; - }; + runHook postInstall + ''; - updateScript = writeShellScript "update-sketchybar-app-font" '' - set -o errexit - export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}" - NEW_VERSION=$(curl --silent https://api.github.com/repos/kvndrsslr/sketchybar-app-font/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) - if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then - echo "The new version same as the old version." - exit 0 - fi - for artifact in ${lib.escapeShellArgs (lib.mapAttrsToList(a: _: a) finalAttrs.passthru.sources)}; do - update-source-version "sketchybar-app-font" "$NEW_VERSION" --ignore-same-version --source-key="sources.$artifact" - done - ''; - }; + passthru.updateScript = nix-update-script { }; - meta = { - description = "Ligature-based symbol font and a mapping function for sketchybar"; - longDescription = '' - A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. - ''; - homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; - license = lib.licenses.cc0; - maintainers = with lib.maintainers; [ khaneliman ]; - }; - }) + meta = { + description = "Ligature-based symbol font and a mapping function for sketchybar"; + longDescription = '' + A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. + ''; + homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ khaneliman ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/sm/smartgithg/package.nix b/pkgs/by-name/sm/smartgithg/package.nix index 65c5a78ad299e..d3bb1ed1b67d7 100644 --- a/pkgs/by-name/sm/smartgithg/package.nix +++ b/pkgs/by-name/sm/smartgithg/package.nix @@ -5,7 +5,7 @@ , openjdk21 , gtk3 , glib -, gnome +, adwaita-icon-theme , wrapGAppsHook3 , libXtst , which @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook3 ]; - buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; + buildInputs = [ jre adwaita-icon-theme gtk3 ]; preFixup = with lib; '' gappsWrapperArgs+=( \ diff --git a/pkgs/by-name/sp/spades/package.nix b/pkgs/by-name/sp/spades/package.nix index 9a60ee499a645..8ec4b71400d5a 100644 --- a/pkgs/by-name/sp/spades/package.nix +++ b/pkgs/by-name/sp/spades/package.nix @@ -1,46 +1,74 @@ { lib, stdenv, - fetchurl, - zlib, bzip2, cmake, + fetchFromGitHub, + fetchpatch, + ncurses, python3, + readline, }: stdenv.mkDerivation (finalAttrs: { pname = "spades"; - version = "3.15.5"; + version = "4.0.0"; - src = fetchurl { - url = "https://github.com/ablab/spades/releases/download/v${finalAttrs.version}/SPAdes-${finalAttrs.version}.tar.gz"; - hash = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o="; + src = fetchFromGitHub { + owner = "ablab"; + repo = "spades"; + rev = "v${finalAttrs.version}"; + hash = "sha256-k2+ddJIgGE41KGZODovU9VdurbWerEtdqNrFDwyuFjo="; }; - sourceRoot = "SPAdes-${finalAttrs.version}/src"; - env.CXXFLAGS = toString [ - # GCC 13: error: 'uint32_t' does not name a type - "-include cstdint" + sourceRoot = "source/src"; + + patches = [ + # https://github.com/ablab/spades/pull/1314 + (fetchpatch { + name = "copytree.patch"; + url = "https://github.com/ablab/spades/commit/af1f756a46c5da669897b841d4f753af1eaa9588.patch"; + hash = "sha256-tkT7hb0TqsbLkcTs9u43nzvV8bVdh3G9VKYqFFLrQv8="; + stripLen = 3; + extraPrefix = "projects/"; + }) + ]; + + cmakeFlags = [ + "-DZLIB_ENABLE_TESTS=OFF" + "-DSPADES_BUILD_INTERNAL=OFF" ]; + preConfigure = '' + # The CMakeListsInternal.txt file should be empty in the release tarball + echo "" > CMakeListsInternal.txt + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ - zlib bzip2 + ncurses python3 + readline ]; doCheck = true; + strictDeps = true; + meta = { description = "St. Petersburg genome assembler, a toolkit for assembling and analyzing sequencing data"; - license = lib.licenses.gpl2Only; + changelog = "https://github.com/ablab/spades/blob/${finalAttrs.version}/changelog.md"; + downloadPage = "https://github.com/ablab/spades"; homepage = "http://ablab.github.io/spades"; + license = lib.licenses.gpl2Only; platforms = [ + "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with lib.maintainers; [ bzizou ]; + broken = stdenv.hostPlatform.isMusl && stdenv.isDarwin; }; }) diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index af1468b42850f..0580a22990291 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.7-1"; + version = "0.6.0-1"; rev = "v${self.version}"; - hash = "sha256-TUYiReCWryNFfJ0lFBKNJiauil8ZwRSG8X9Bsdtwswc="; + hash = "sha256-guC2NLIg0NGyflgtrl5X2FiDKCwKd/7mglMEn56uF3Q="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix index b64b18300b9e2..aef563ba3df40 100644 --- a/pkgs/by-name/ss/sshesame/package.nix +++ b/pkgs/by-name/ss/sshesame/package.nix @@ -1,25 +1,26 @@ { lib , buildGoModule , fetchFromGitHub +, stdenv , nix-update-script }: buildGoModule rec { pname = "sshesame"; - version = "0.0.27"; + version = "0.0.35"; src = fetchFromGitHub { owner = "jaksi"; repo = "sshesame"; rev = "v${version}"; - hash = "sha256-pDLCOyjvbHM8Cw1AIt7+qTbCmH0tGSmwaTBz5pQ05bc="; + hash = "sha256-D+vygu+Zx/p/UmqOXqx/4zGv6mtCUKTeU5HdBhxdbN4="; }; - vendorHash = "sha256-iaINGWpj2gHfwsIOEp5PwlFBohXX591+/FBGyu656qI="; + vendorHash = "sha256-WX3rgv9xz3lisYSjf7xvx4oukDSuxE1yqLl6Sz/iDYc="; ldflags = [ "-s" "-w" ]; - hardeningEnable = [ "pie" ]; + hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 14df24b62ef85..abb197c6c70eb 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -23,7 +23,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.8.2"; + version = "0.8.3"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-JzbfQ/WZrHGdG9vv9ngfTxqwBxS+ZezIIp8yUJ2VplE="; + hash = "sha256-zaEe7/qQOz+kco8Fo4d9xx/v6PZarjEMTSXO0nDxxh0="; fetchSubmodules = true; }; - cargoHash = "sha256-w40mksUVMBXSr/LBXj0uyZ/VbvJFMFJaQN5Kx6sLm5I="; + cargoHash = "sha256-/B1O7Tvj/CfRKPmnHxl+I4eNCT8sx75l8z/1JBXpPks="; patches = [ # Remove "PermissionsStartOnly" from systemd service files, diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index a85e7d36f9828..d03e07ffc12ec 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.10.18"; + version = "2.10.19"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8="; + hash = "sha256-1mmKpcJJdEiX/KZkE/VnL/xMrNzlq1LSAr5z3CdoPMI="; }; sourceRoot = "."; diff --git a/pkgs/by-name/st/steam-play-none/package.nix b/pkgs/by-name/st/steam-play-none/package.nix new file mode 100644 index 0000000000000..7cca9fe29b7fc --- /dev/null +++ b/pkgs/by-name/st/steam-play-none/package.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub +, stdenvNoCC +, lib +, bash +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "steam-play-none"; + version = "0-unstable-2022-12-15"; + src = fetchFromGitHub { + repo = finalAttrs.pname; + owner = "Scrumplex"; + rev = "42e38706eb37fdaaedbe9951d59ef44148fcacbf"; + hash = "sha256-sSHLrB5TlGMKpztTnbh5oIOhcrRd+ke2OUUbiQUqoh0="; + }; + buildInputs = [ bash ]; + strictDeps = true; + outputs = [ "out" "steamcompattool" ]; + installPhase = '' + runHook preInstall + + # Make it impossible to add to an environment. You should use the appropriate NixOS option. + # Also leave some breadcrumbs in the file. + echo "${finalAttrs.pname} should not be installed into environments. Please use programs.steam.extraCompatPackages instead." > $out + + install -Dt $steamcompattool compatibilitytool.vdf toolmanifest.vdf + install -Dt $steamcompattool -m755 launch.sh + + runHook postInstall + ''; + + meta = { + description = '' + Steam Play Compatibility Tool to run games as-is + + (This is intended for use in the `programs.steam.extraCompatPackages` option only.) + ''; + homepage = "https://github.com/Scrumplex/Steam-Play-None"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ matthewcroughan Scrumplex ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index 95d11ba10aeef..326feb08afa62 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "strictdoc"; - version = "0.0.56"; + version = "0.0.57"; pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; repo = "strictdoc"; rev = "refs/tags/${version}"; - hash = "sha256-T2xFMExRas7mxfjmAZnv3kiHdc+eEFdCf7TG1ABzgWM="; + hash = "sha256-1zURXE3y6um1wYu4Di7G4mrU5sl9QIY1HKEQlni+aEg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/st/sttr/package.nix b/pkgs/by-name/st/sttr/package.nix index 7c9256b2ae35c..4d2a508cf7682 100644 --- a/pkgs/by-name/st/sttr/package.nix +++ b/pkgs/by-name/st/sttr/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sttr"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "abhimanyu003"; repo = "sttr"; rev = "v${version}"; - hash = "sha256-XBg/t2hspKdgkRgU95VLfi74cnA9OZ03x4deFOu+2do="; + hash = "sha256-VEfMkUMrn9yKMg1M56uFhM8ego3EyY1MqEgzkZE6Zbk="; }; - vendorHash = "sha256-OuPPK4ordP/yzH+0sCRKO9szJ81LUbvM2Z8U88O6Qwc="; + vendorHash = "sha256-L3XKjJSk/1Evzq4ieUsJ4ewyfS8NDDSd10aDdsc5IcI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix index 21abce75d3d0f..0ba66643442ba 100644 --- a/pkgs/by-name/su/superfile/package.nix +++ b/pkgs/by-name/su/superfile/package.nix @@ -3,30 +3,27 @@ buildGoModule, fetchFromGitHub, }: -let - version = "1.1.2"; -in -buildGoModule { +buildGoModule rec { pname = "superfile"; - inherit version; + version = "1.1.3"; - src = - fetchFromGitHub { - owner = "MHNightCat"; - repo = "superfile"; - rev = "v${version}"; - hash = "sha256-Cn03oPGT+vCZQcC62p7COx8N8BGgra+qQaZyF+osVsA="; - } - + "/src"; + src = fetchFromGitHub { + owner = "yorukot"; + repo = "superfile"; + rev = "v${version}"; + hash = "sha256-z1jcRzID20s7tEDUaEcnOYBfv/BPZtcXz9fy3V5iPPg="; + }; + + vendorHash = "sha256-OzPH7dNu/V4HDGSxrvYxu3s+hw36NiulFZs0BJ44Pjk="; - vendorHash = "sha256-gWrhy3qzlXG072u5mW971N2Y4Vmt0KbZkB8SFsFgSzo="; + ldflags = ["-s" "-w"]; - meta = { - changelog = "https://github.com/MHNightCat/superfile/blob/v${version}/changelog.md"; + meta = with lib; { description = "Pretty fancy and modern terminal file manager"; - homepage = "https://github.com/MHNightCat/superfile"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + homepage = "https://github.com/yorukot/superfile"; + changelog = "https://github.com/yorukot/superfile/blob/${src.rev}/changelog.md"; + license = licenses.mit; + maintainers = with maintainers; [momeemt]; mainProgram = "superfile"; }; } diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 2f877d881ae4e..f789d28f90d8b 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-tuXpK1KYp0INSCuCQFw1crgPjqW655AagwHZswLrodg="; + hash = "sha256-SbG5jzsR1ggGYbQ3kwrvKeGfkF+LlZwPV6L5/rKT49A="; }; - vendorHash = "sha256-hYFz9XEYkHv9HOCYKE3a17eDUspv6QmkH/+ipjJuaz0="; + vendorHash = "sha256-N2HdXGdb0OEfczPmc40jdx1rxKj2vxcEjbn+6K6vHhU="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/by-name/su/sushi/package.nix index 18f6b382737df..aad4727da20b1 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/by-name/su/sushi/package.nix @@ -4,6 +4,7 @@ , meson , gettext , gobject-introspection +, evince , glib , gnome , gtksourceview4 @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gnome.evince + evince icu harfbuzz gjs @@ -71,7 +72,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "sushi"; - attrPath = "gnome.sushi"; }; }; diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json index 9aaf276067218..d4d9aaa3baa49 100644 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "svelte-language-server", - "version": "0.16.11", + "version": "0.16.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "svelte-language-server", - "version": "0.16.11", + "version": "0.16.13", "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.17", @@ -20,8 +20,8 @@ "svelte": "^3.57.0", "svelte-preprocess": "^5.1.3", "svelte2tsx": "~0.7.0", - "typescript": "^5.3.2", - "typescript-auto-import-cache": "^0.3.2", + "typescript": "^5.5.2", + "typescript-auto-import-cache": "^0.3.3", "vscode-css-languageservice": "~6.2.10", "vscode-html-languageservice": "~5.1.1", "vscode-languageserver": "8.0.2", @@ -1635,9 +1635,9 @@ } }, "node_modules/svelte2tsx": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.10.tgz", - "integrity": "sha512-POOXaTncPGjwXMj6NVSRvdNj8KFqqLabFtXsQal3WyPy4X5raGsiDST2+ELhceKwfHk79/hR3qGUeU7KxYo4vQ==", + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.13.tgz", + "integrity": "sha512-aObZ93/kGAiLXA/I/kP+x9FriZM+GboB/ReOIGmLNbVGEd2xC+aTCppm3mk1cc9I/z60VQf7b2QDxC3jOXu3yw==", "dependencies": { "dedent-js": "^1.0.1", "pascal-case": "^3.1.1" @@ -1737,9 +1737,9 @@ } }, "node_modules/typescript-auto-import-cache": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz", - "integrity": "sha512-+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz", + "integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==", "dependencies": { "semver": "^7.3.8" } diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 008abf6bc6f2e..fbb086c540af7 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -3,17 +3,17 @@ , fetchurl }: let - version = "0.16.11"; + version = "0.16.13"; in buildNpmPackage { pname = "svelte-language-server"; inherit version; src = fetchurl { url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-xTBdiOS6XwJN5t6L49COWeoyMUBRzlxbAND5S1e9/Xw="; + hash = "sha256-BtKeYAFDxaGPvN3d/2Kt+ViNukfKV92c6K0W2qdQHjU="; }; - npmDepsHash = "sha256-RR67TdgQHgF7RdrHjebGzIVGkeLABwXQgikd+Bc8lSE="; + npmDepsHash = "sha256-YG6gxXDfgaHevwO62EdhWTXXZq/plC7Mx9RKZNDyLqo="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index c34507c91e448..30e540ba74165 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -7,7 +7,6 @@ , copyDesktopItems , ffmpeg , glibc -, gnome , jq , lib , libmediainfo @@ -20,6 +19,7 @@ , vapoursynth , xdg-utils , xorg +, zenity }: let mpvForSVP = callPackage ./mpv.nix { }; @@ -42,7 +42,7 @@ let fakeLsof ffmpeg.bin glibc - gnome.zenity + zenity libmediainfo libsForQt5.qtbase libsForQt5.qtwayland diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index 2c3f8415d3493..20b099e47ad02 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mozilla-services/syncstorage-rs"; changelog = "https://github.com/mozilla-services/syncstorage-rs/releases/tag/${version}"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ pennae ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "syncserver"; }; diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index a22f8ea1b105a..29fc520edc30b 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-06-20"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "2b97f3441970efe67c788a8313eb58182aa7965b"; - hash = "sha256-XPAKjBLaTGEyDgiZT8tYinYzMivOocOEeauzR4leOjI="; + rev = "cfe4a3a898c7f7b2e7065095c7fdcc33d99ed4bf"; + hash = "sha256-UrAKFehcqsuFHJJC0Ske+tOr6Wquqm/BM536hKoGEWw="; }; postPatch = '' diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 316169bdf85ad..a7d1a466b97a7 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.0.16"; + version = "0.0.18"; in buildNpmPackage { pname = "tailwindcss-language-server"; @@ -19,11 +19,11 @@ buildNpmPackage { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; rev = "@tailwindcss/language-server@v${version}"; - hash = "sha256-azzWrT8Ac+bdEfmNo+9WfQgHwA3+q9yGZMLfYXAQHtU="; + hash = "sha256-A2P7AzFciVpXEWOH6hu2+TYKTn23z1iS8mmD0nvsR2Y="; }; makeCacheWritable = true; - npmDepsHash = "sha256-z2fLtGnYgI8ocWTBrqpdElgjNghoE42LFJRWyVt/U7M="; + npmDepsHash = "sha256-/vr7PCohzw4QEEOx6+7IAzBM4xC2nxvNb3PLtSUT7YM="; npmWorkspace = "packages/tailwindcss-language-server"; buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); diff --git a/pkgs/by-name/te/telescope/package.nix b/pkgs/by-name/te/telescope/package.nix index 368c15d7e6368..8198bd4750f74 100644 --- a/pkgs/by-name/te/telescope/package.nix +++ b/pkgs/by-name/te/telescope/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.9.1"; + version = "0.10"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-OAqXYmlehL9AjZ7V0U0h7RCm/hn77Sf0Wp6R/GRaGY8="; + hash = "sha256-hkXXM/I7sNFomWamT0q1JH62arX1hFbt68Axcijadug="; }; postPatch = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Telescope is a w3m-like browser for Gemini"; - homepage = "https://telescope.omarpolo.com/"; + homepage = "https://www.telescope-browser.org/"; license = licenses.isc; maintainers = with maintainers; [ heph2 ]; platforms = platforms.unix; diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 31effdf8334b4..0eab42e15d36a 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "templ"; - version = "0.2.707"; + version = "0.2.731"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-4TkK8zeoWWGmcBg8YwALo2EyKfOyq5ut/3TjG81a+8M="; + hash = "sha256-vql4yujvSESrelmRvlo1XsnQHZf4f4tHmqtayrs2dsk="; }; - vendorHash = "sha256-Fa6bmG0yfbICMfHlM52V+obxoVsQa4VNydIHXS+lGxw="; + vendorHash = "sha256-w+nOXGPUt0K1d8q3Co6Xkvz1IMFBnerS7oZ7YWO7qKI="; subPackages = [ "cmd/templ" ]; diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index 800bea1565501..3796065194ab6 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tenv"; - version = "2.1.8"; + version = "2.2.1"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-9wY+9lAbrnwiXpLilMaqtQz0XmMGRMv+m+yR7BxmSsw="; + hash = "sha256-je+T+Kbin0O7CuTRSsv3u+3IWLahTRn8io7yasubLM8="; }; vendorHash = "sha256-v1NWlZhfypoS+bZCtr+P2s1t4qYVncbjx9IyRhi2sa4="; diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index cc5b898985109..80c2df8d89027 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.59.3"; + version = "0.59.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3tXhv/W8F9ag5G7hOjuS7AOU0sdpjdasedhPgMQAV0k="; + hash = "sha256-B5rcbAxWatPgYZgNWVJyOQU79kH2vVEGeSend83kLrk="; }; nativeBuildInputs = [ go-mockery ]; @@ -21,7 +21,7 @@ buildGoModule rec { make generate-mocks ''; - vendorHash = "sha256-a/pWEgEcT8MFES0/Z1vFCnbSaI47ZIVjhWZbvMC/OJk="; + vendorHash = "sha256-15d20xDw19TEqfWQDVp+sQ0GPwIxe3q3ibxyAC2uydA="; doCheck = false; diff --git a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix index 00a5458c08821..8b43215c52dc0 100644 --- a/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix +++ b/pkgs/by-name/th/thcrap-steam-proton-wrapper/package.nix @@ -5,7 +5,7 @@ , makeWrapper , bash , subversion - , gnome + , zenity }: stdenv.mkDerivation { pname = "thcrap-proton"; @@ -37,7 +37,7 @@ stdenv.mkDerivation { lib.makeBinPath [ bash subversion - gnome.zenity + zenity ] } ''; diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 6d7f036cc7357..ec841bf463b2e 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -175,26 +175,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "async-lsp" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "855d6246a5d31e6e469eeef718d9a098f2d99207985a00dfdd3f4b5c5003c09a" -dependencies = [ - "futures", - "lsp-types", - "pin-project-lite", - "rustix", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower-layer", - "tower-service", - "tracing", - "waitpid-any", -] - -[[package]] name = "async-trait" version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3716,6 +3696,26 @@ dependencies = [ ] [[package]] +name = "sync-lsp" +version = "0.11.13" +dependencies = [ + "anyhow", + "clap", + "crossbeam-channel", + "futures", + "log", + "lsp-server", + "lsp-types", + "parking_lot", + "reflexo", + "serde", + "serde_json", + "tinymist-query", + "tokio", + "tokio-util", +] + +[[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3836,7 +3836,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.12" +version = "0.11.13" dependencies = [ "insta", "lsp-server", @@ -3933,10 +3933,9 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.12" +version = "0.11.13" dependencies = [ "anyhow", - "async-lsp", "async-trait", "await-tree", "base64 0.22.1", @@ -3967,7 +3966,8 @@ dependencies = [ "reflexo", "serde", "serde_json", - "tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)", + "sync-lsp", + "tinymist-assets 0.11.12", "tinymist-query", "tinymist-render", "tokio", @@ -3995,16 +3995,16 @@ dependencies = [ [[package]] name = "tinymist-assets" version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5" [[package]] name = "tinymist-assets" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5" +version = "0.11.13" [[package]] name = "tinymist-query" -version = "0.11.12" +version = "0.11.13" dependencies = [ "anyhow", "biblatex", @@ -4050,7 +4050,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.12" +version = "0.11.13" dependencies = [ "base64 0.22.1", "log", @@ -4428,7 +4428,7 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.12" +version = "0.11.13" dependencies = [ "await-tree", "clap", @@ -4440,7 +4440,7 @@ dependencies = [ "once_cell", "serde", "serde_json", - "tinymist-assets 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.12", "tokio", "tokio-tungstenite", "typst", @@ -4891,16 +4891,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waitpid-any" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0189157c93c54d86e5c61ddf0c1223baa25e5bfb2f6f9983c678985b028d7c12" -dependencies = [ - "rustix", - "windows-sys 0.52.0", -] - -[[package]] name = "walkdir" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 2e001701e715a..bbd47b1892395 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-hqTVfEKaAG18JpUZajm0XaoX6kw26aE37T/kfoNNxk8="; + hash = "sha256-aAeDeW1EiF8NqsIAQ39RaTHq6wC39QeMptvwTJ3/ZWc="; }; cargoLock = { diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/by-name/to/totem/package.nix index 56da00923f949..c2cf2ff9a7d46 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -125,7 +125,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "totem"; - attrPath = "gnome.totem"; }; }; diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index 81ca1b6b6f626..e62d1de596499 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-Ckvpb2at7lg7AB0XNtIxeo8lWXX+04MVHHKoUs876dg="; + hash = "sha256-059lZJ68jGJQYYNqVXetntPrquMY7BZrYHNdL5jmq3M="; }; vendorHash = "sha256-rjdGNfR2DpLZCzL/+3xiZ7gGDd4bPyBT5qMCO+NyWbg="; diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix index 228dccf4ad418..ad6799ad62017 100644 --- a/pkgs/by-name/tr/trickest-cli/package.nix +++ b/pkgs/by-name/tr/trickest-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "trickest-cli"; - version = "1.7.5"; + version = "1.8.0"; src = fetchFromGitHub { owner = "trickest"; repo = "trickest-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-erPcb+cHCAmhPGwfu+g0yyAFx252+tpIOFQiUBuPUcs="; + hash = "sha256-wzBUPotuv1natDB896Uu+O9Nj4ycT8jkcvIumjMdbqs="; }; vendorHash = "sha256-gk8YMMvTHBL7yoXU9n0jhtUS472fqLW5m+mSl4Lio6c="; diff --git a/pkgs/by-name/tr/trigger-control/package.nix b/pkgs/by-name/tr/trigger-control/package.nix index b0a389e29ec4e..3398a3fe0aabb 100644 --- a/pkgs/by-name/tr/trigger-control/package.nix +++ b/pkgs/by-name/tr/trigger-control/package.nix @@ -10,13 +10,9 @@ , libdecor , libnotify , dejavu_fonts -, gnome +, zenity }: -let - inherit (gnome) zenity; -in - stdenv.mkDerivation (finalAttrs: { pname = "trigger-control"; version = "1.5.1"; diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix index c2b214ce55b15..7ccb8e4b237f0 100644 --- a/pkgs/by-name/tu/tuifimanager/package.nix +++ b/pkgs/by-name/tu/tuifimanager/package.nix @@ -3,7 +3,7 @@ , python3 , fetchFromGitHub , kdePackages -, gnome +, gnome-themes-extra , qt6 , makeWrapper , x11Support ? stdenv.isLinux @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = let # fix missing 'adwaita' warning missing with ncurses tui # see: https://github.com/NixOS/nixpkgs/issues/60918 - theme = gnome.gnome-themes-extra; + theme = gnome-themes-extra; in lib.optionalString enableDragAndDrop '' wrapProgram $out/bin/tuifi \ diff --git a/pkgs/by-name/tx/txr/package.nix b/pkgs/by-name/tx/txr/package.nix index 0b40b8e77a596..dfa532e494c71 100644 --- a/pkgs/by-name/tx/txr/package.nix +++ b/pkgs/by-name/tx/txr/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "txr"; - version = "294"; + version = "295"; src = fetchurl { url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2"; - hash = "sha256-QdkN4FwobGRPQNQGcHC62Wi5hwQqsgyLo9etYYEfqDc="; + hash = "sha256-0HLrbO4v4gfk95w5SIXeQ/oNQMCMKBDkhtVJiVQtCYU="; }; buildInputs = [ libffi ]; diff --git a/pkgs/by-name/ug/uglify-js/package-lock.json b/pkgs/by-name/ug/uglify-js/package-lock.json new file mode 100644 index 0000000000000..961c9ef4314f5 --- /dev/null +++ b/pkgs/by-name/ug/uglify-js/package-lock.json @@ -0,0 +1,44 @@ +{ + "name": "uglify-js", + "version": "3.18.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "uglify-js", + "version": "3.18.0", + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "devDependencies": { + "acorn": "~8.7.1", + "semver": "~6.3.0" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/acorn": { + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + } + } +} diff --git a/pkgs/by-name/ug/uglify-js/package.nix b/pkgs/by-name/ug/uglify-js/package.nix new file mode 100644 index 0000000000000..4056c78af31f0 --- /dev/null +++ b/pkgs/by-name/ug/uglify-js/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + testers, + runCommand, + writeText, + uglify-js, +}: + +buildNpmPackage rec { + pname = "uglify-js"; + version = "3.18.0"; + + src = fetchFromGitHub { + owner = "mishoo"; + repo = "UglifyJS"; + rev = "v${version}"; + hash = "sha256-m+OEcvWEk4RX0C4re9TFZpkcBvSwl7qfIM+56t100ws="; + }; + + npmDepsHash = "sha256-iLWmNifHpVvFSFXkfItVpGlh6za9T9wSr1Af4CQQSGM="; + + postPatch = '' + cp ${./package-lock.json} package-lock.json + ''; + + dontNpmBuild = true; + + passthru = { + updateScript = ./update.sh; + tests = { + version = testers.testVersion { package = uglify-js; }; + + simple = testers.testEqualContents { + assertion = "uglify-js minifies a basic js file"; + expected = writeText "expected" '' + console.log(1); + ''; + actual = + runCommand "actual" + { + nativeBuildInputs = [ uglify-js ]; + base = writeText "base" '' + console . log ( ( 1 ) ) ; + ''; + } + '' + uglifyjs $base > $out + ''; + }; + }; + }; + + meta = { + homepage = "https://github.com/mishoo/UglifyJS"; + description = "JavaScript parser / mangler / compressor / beautifier toolkit"; + mainProgram = "uglifyjs"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ lelgenio ]; + }; +} diff --git a/pkgs/by-name/ug/uglify-js/update.sh b/pkgs/by-name/ug/uglify-js/update.sh new file mode 100755 index 0000000000000..a9ebcf39e93b6 --- /dev/null +++ b/pkgs/by-name/ug/uglify-js/update.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p ripgrep common-updater-scripts nodejs prefetch-npm-deps jq + +set -xeu -o pipefail + +PACKAGE_DIR="$(realpath "$(dirname "$0")")" +cd "$PACKAGE_DIR/.." +while ! test -f flake.nix; do cd .. ; done +NIXPKGS_DIR="$PWD" + +version="$( + list-git-tags --url=https://github.com/mishoo/UglifyJS \ + | rg '^v([\d.]+)$' -r '$1' \ + | sort --version-sort \ + | tail -n1 +)" +update-source-version uglify-js "$version" + +TMPDIR="$(mktemp -d)" +trap "rm -rf '$TMPDIR'" EXIT +cd "$TMPDIR" + +src="$(nix-build --no-link "$NIXPKGS_DIR" -A uglify-js.src)" +cp $src/package*.json . + +# Maybe one day upstream may ship a package-lock.json, +# until then we must generate a fresh one +test -f package-lock.json || npm install --package-lock-only +cp -v package-lock.json "$PACKAGE_DIR/package-lock.json" + +prev_npm_hash=$( + nix-instantiate "$NIXPKGS_DIR" \ + --eval --json -A uglify-js.npmDepsHash \ + | jq -r . +) +new_npm_hash=$(prefetch-npm-deps ./package-lock.json) +sd --fixed-strings "$prev_npm_hash" "$new_npm_hash" "$PACKAGE_DIR/package.nix" diff --git a/pkgs/by-name/ve/versionCheckHook/hook.sh b/pkgs/by-name/ve/versionCheckHook/hook.sh new file mode 100644 index 0000000000000..cd417493e6c2d --- /dev/null +++ b/pkgs/by-name/ve/versionCheckHook/hook.sh @@ -0,0 +1,60 @@ +_handleCmdOutput(){ + local versionOutput + versionOutput="$(env --chdir=/ --argv0="$(basename "$1")" --ignore-environment "$@" 2>&1 || true)" + if [[ "$versionOutput" =~ "$version" ]]; then + echoPrefix="Successfully managed to" + else + echoPrefix="Did not" + fi + # The return value of this function is this variable: + echo "$echoPrefix" + # And in anycase we want these to be printed in the build log, useful for + # debugging, so we print these to stderr. + echo "$echoPrefix" find version "$version" in the output of the command \ + "$@" >&2 + echo "$versionOutput" >&2 +} +versionCheckHook(){ + runHook preVersionCheck + echo Executing versionCheckPhase + + local cmdProgram cmdArg echoPrefix + if [[ -z "${versionCheckProgram-}" ]]; then + if [[ -z "${pname-}" ]]; then + echo "both \$pname and \$versionCheckProgram are empty, so" \ + "we don't know which program to run the versionCheckPhase" \ + "upon" >&2 + exit 2 + else + cmdProgram="${!outputBin}/bin/$pname" + fi + else + cmdProgram="$versionCheckProgram" + fi + if [[ ! -x "$cmdProgram" ]]; then + echo "versionCheckHook: $cmdProgram was not found, or is not an executable" >&2 + exit 2 + fi + if [[ -z "${versionCheckProgramArg}" ]]; then + for cmdArg in "--help" "--version"; do + echoPrefix="$(_handleCmdOutput "$cmdProgram" "$cmdArg")" + if [[ "$echoPrefix" == "Successfully managed to" ]]; then + break + fi + done + else + cmdArg="$versionCheckProgramArg" + echoPrefix="$(_handleCmdOutput "$cmdProgram" "$cmdArg")" + fi + if [[ "$echoPrefix" == "Did not" ]]; then + exit 2 + fi + + runHook postVersionCheck + echo Finished versionCheckPhase +} + +if [[ -z "${dontVersionCheck-}" ]]; then + echo "Using versionCheckHook" + preInstallCheckHooks+=(versionCheckHook) +fi diff --git a/pkgs/by-name/ve/versionCheckHook/package.nix b/pkgs/by-name/ve/versionCheckHook/package.nix new file mode 100644 index 0000000000000..ed35384d79605 --- /dev/null +++ b/pkgs/by-name/ve/versionCheckHook/package.nix @@ -0,0 +1,12 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "version-check-hook"; + meta = { + description = "Lookup for $version in the output of --help and --version"; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} ./hook.sh diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 2c60537b0cb44..585c989f4c510 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -16,6 +16,7 @@ pnpm, nodejs, withTTS ? true, + withMiddleClickScroll ? false, # Enables the use of vencord from nixpkgs instead of # letting vesktop manage it's own version withSystemVencord ? false, @@ -134,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ + ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index 8c46715b023a5..2fac21d32f2f0 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "24.2.3"; + version = "24.2.5"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - sha256 = "sha256-n2lkt7zRlpbPedNxa21EQvFdYyOAPF//TsY4srbGHQE="; + sha256 = "sha256-WYlA8+i8TTFHsU4+doLcv75F9MR2V/BEuNGGLgM4p1s="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/vu/vue-language-server/package-lock.json b/pkgs/by-name/vu/vue-language-server/package-lock.json index 7be780852f85e..682ef08c3232e 100644 --- a/pkgs/by-name/vu/vue-language-server/package-lock.json +++ b/pkgs/by-name/vu/vue-language-server/package-lock.json @@ -1,19 +1,19 @@ { "name": "@vue/language-server", - "version": "2.0.21", + "version": "2.0.24", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@vue/language-server", - "version": "2.0.21", + "version": "2.0.24", "license": "MIT", "dependencies": { - "@volar/language-core": "~2.3.0-alpha.15", - "@volar/language-server": "~2.3.0-alpha.15", - "@vue/language-core": "2.0.21", - "@vue/language-service": "2.0.21", - "@vue/typescript-plugin": "2.0.21", + "@volar/language-core": "~2.4.0-alpha.2", + "@volar/language-server": "~2.4.0-alpha.2", + "@vue/language-core": "2.0.24", + "@vue/language-service": "2.0.24", + "@vue/typescript-plugin": "2.0.24", "vscode-languageserver-protocol": "^3.17.5", "vscode-uri": "^3.0.8" }, @@ -86,22 +86,22 @@ "integrity": "sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA==" }, "node_modules/@volar/language-core": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.3.0.tgz", - "integrity": "sha512-pvhL24WUh3VDnv7Yw5N1sjhPtdx7q9g+Wl3tggmnkMcyK8GcCNElF2zHiKznryn0DiUGk+eez/p2qQhz+puuHw==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.7.tgz", + "integrity": "sha512-3ncRpnoVHCTzJeTiUyKwFTLb3jGfe1r5+S3MwRDPEjsV4LID6Rq6EmdRoF+aKw+Iwg63x4nV+/KYZjeYrp5mNA==", "dependencies": { - "@volar/source-map": "2.3.0" + "@volar/source-map": "2.4.0-alpha.7" } }, "node_modules/@volar/language-server": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.3.0.tgz", - "integrity": "sha512-KXujrZoBd4lhdL+N+4bwsPbDZy8/zFyZSiyqLr6uIbSxJC/njRznQx5u5y5Txw5hbNuQCCR9B8EPv2jjKUbyeA==", - "dependencies": { - "@volar/language-core": "2.3.0", - "@volar/language-service": "2.3.0", - "@volar/snapshot-document": "2.3.0", - "@volar/typescript": "2.3.0", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.7.tgz", + "integrity": "sha512-WxCFxHRy5SOEJAUEcStMW6OuC/V25y5AsJEyJaPq5sZ76EeJgc8BbImO6Yi7r6qXRENDjcVTE10t2JR4t5+qRw==", + "dependencies": { + "@volar/language-core": "2.4.0-alpha.7", + "@volar/language-service": "2.4.0-alpha.7", + "@volar/snapshot-document": "2.4.0-alpha.7", + "@volar/typescript": "2.4.0-alpha.7", "path-browserify": "^1.0.1", "request-light": "^0.7.0", "vscode-languageserver": "^9.0.1", @@ -111,39 +111,36 @@ } }, "node_modules/@volar/language-service": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.3.0.tgz", - "integrity": "sha512-U0ggeoHh4afYflGD2vjw8QPwnnDg5V4QDkZ5meL+B2YwrXEF9bVAHTjYaR8AxJ2qb3mwOwXLtZ9psJJSjkdctw==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.7.tgz", + "integrity": "sha512-vSuH2c0o7z9zDPcmUGqK9sT4l71B8Ooj6VKKB1H6F++ZAI0I9Uch7V7wc6VQjuB2LuYmojxwKxl1bydjnGxpHg==", "dependencies": { - "@volar/language-core": "2.3.0", + "@volar/language-core": "2.4.0-alpha.7", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/@volar/snapshot-document": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.3.0.tgz", - "integrity": "sha512-0dBMaxElxYOX9eSRjpIM5+cV0aqrypArJwjCzc/gQ3E1H+MEAi3YpAzUyLxG8aSidUm8msUWZc4X+gP/rSIeng==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.7.tgz", + "integrity": "sha512-gBxnWi1ioC97bpynl9M0GE8XTiIDnslgCsCSi2WgNEaknrivYs9bR6dsA2G0iMz7lHScim47pmIlhtO9eSvY7A==", "dependencies": { "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/@volar/source-map": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.3.0.tgz", - "integrity": "sha512-G/228aZjAOGhDjhlyZ++nDbKrS9uk+5DMaEstjvzglaAw7nqtDyhnQAsYzUg6BMP9BtwZ59RIw5HGePrutn00Q==", - "dependencies": { - "muggle-string": "^0.4.0" - } + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.7.tgz", + "integrity": "sha512-yn66qcUXxUCyyW8PXMHE4z9RdfTO1OhP6BMa/JI0Ed6I6bggzkxvXsJOaMqw3EalCskGPuIWAbWgxwa3Hlp7SA==" }, "node_modules/@volar/typescript": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.3.0.tgz", - "integrity": "sha512-PtUwMM87WsKVeLJN33GSTUjBexlKfKgouWlOUIv7pjrOnTwhXHZNSmpc312xgXdTjQPpToK6KXSIcKu9sBQ5LQ==", + "version": "2.4.0-alpha.7", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.7.tgz", + "integrity": "sha512-MjvkhcIYPDZS5vbE4bSvbWi8z/VI47AY8MkPVgfa6xqTDLLxV6+QulJ8hIC3wYxh3dfVmA5MOoL5c3cZAsWbDQ==", "dependencies": { - "@volar/language-core": "2.3.0", + "@volar/language-core": "2.4.0-alpha.7", "path-browserify": "^1.0.1", "vscode-uri": "^3.0.8" } @@ -171,36 +168,37 @@ "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" }, "node_modules/@vue/compiler-core": { - "version": "3.4.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.29.tgz", - "integrity": "sha512-TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==", + "version": "3.4.31", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.31.tgz", + "integrity": "sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==", "dependencies": { "@babel/parser": "^7.24.7", - "@vue/shared": "3.4.29", + "@vue/shared": "3.4.31", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz", - "integrity": "sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==", + "version": "3.4.31", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz", + "integrity": "sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==", "dependencies": { - "@vue/compiler-core": "3.4.29", - "@vue/shared": "3.4.29" + "@vue/compiler-core": "3.4.31", + "@vue/shared": "3.4.31" } }, "node_modules/@vue/language-core": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.21.tgz", - "integrity": "sha512-vjs6KwnCK++kIXT+eI63BGpJHfHNVJcUCr3RnvJsccT3vbJnZV5IhHR2puEkoOkIbDdp0Gqi1wEnv3hEd3WsxQ==", + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.24.tgz", + "integrity": "sha512-997YD6Lq/66LXr3ZOLNxDCmyn13z9NP8LU1UZn9hGCDWhzlbXAIP0hOgL3w3x4RKEaWTaaRtsHP9DzHvmduruQ==", "dependencies": { - "@volar/language-core": "~2.3.0-alpha.15", + "@volar/language-core": "~2.4.0-alpha.2", "@vue/compiler-dom": "^3.4.0", "@vue/shared": "^3.4.0", "computeds": "^0.0.1", "minimatch": "^9.0.3", + "muggle-string": "^0.4.1", "path-browserify": "^1.0.1", "vue-template-compiler": "^2.7.14" }, @@ -214,44 +212,44 @@ } }, "node_modules/@vue/language-service": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.21.tgz", - "integrity": "sha512-AyhoOubcGWC0aA/Ae+VUFszeJ9m+6uWrbYlyjNyHF4RM8aj+ymOjzyPVE4WbER3g9sTNu/zm/zu+Sl5avIDZbg==", + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.0.24.tgz", + "integrity": "sha512-CoiTPlc73I/LCji9rnI0Z89GVBOoejUfBzIzEg+6TFw8Eelp2fncgLAvgR8vmOWRVaLn0XgmL2wa0jgtLLderg==", "dependencies": { - "@volar/language-core": "~2.3.0-alpha.15", - "@volar/language-service": "~2.3.0-alpha.15", - "@volar/typescript": "~2.3.0-alpha.15", + "@volar/language-core": "~2.4.0-alpha.2", + "@volar/language-service": "~2.4.0-alpha.2", + "@volar/typescript": "~2.4.0-alpha.2", "@vue/compiler-dom": "^3.4.0", - "@vue/language-core": "2.0.21", + "@vue/language-core": "2.0.24", "@vue/shared": "^3.4.0", - "@vue/typescript-plugin": "2.0.21", + "@vue/typescript-plugin": "2.0.24", "computeds": "^0.0.1", "path-browserify": "^1.0.1", - "volar-service-css": "0.0.50", - "volar-service-emmet": "0.0.50", - "volar-service-html": "0.0.50", - "volar-service-json": "0.0.50", - "volar-service-pug": "0.0.50", - "volar-service-pug-beautify": "0.0.50", - "volar-service-typescript": "0.0.50", - "volar-service-typescript-twoslash-queries": "0.0.50", - "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "volar-service-css": "0.0.56", + "volar-service-emmet": "0.0.56", + "volar-service-html": "0.0.56", + "volar-service-json": "0.0.56", + "volar-service-pug": "0.0.56", + "volar-service-pug-beautify": "0.0.56", + "volar-service-typescript": "0.0.56", + "volar-service-typescript-twoslash-queries": "0.0.56", + "vscode-html-languageservice": "^5.2.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/@vue/shared": { - "version": "3.4.29", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz", - "integrity": "sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==" + "version": "3.4.31", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.31.tgz", + "integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==" }, "node_modules/@vue/typescript-plugin": { - "version": "2.0.21", - "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.21.tgz", - "integrity": "sha512-RNiM0VgETuP/kEhMYfikDoqXvqwO6LZtL8zMLWeciNQFKGq7DCBk8chOO5dpnOXl6hrENCqk3keIvp3jPdLSCQ==", + "version": "2.0.24", + "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.0.24.tgz", + "integrity": "sha512-UjC6iKiyJ1pn0CbcsDW3IyiNb7z7vtABI3b9tDZ8xLGDvVLduZ0qwzq22b5jg2cVEIhLdjbQ4quaEoZflltfTw==", "dependencies": { - "@volar/typescript": "~2.3.0-alpha.15", - "@vue/language-core": "2.0.21", + "@volar/typescript": "~2.4.0-alpha.2", + "@vue/language-core": "2.0.24", "@vue/shared": "^3.4.0" } }, @@ -335,6 +333,12 @@ "version": "2.4.7", "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.7.tgz", "integrity": "sha512-O5O5QNqtdlnQM2bmKHtJgyChcrFMgQuulI+WdiOw2NArzprUqqxUW6bgYtKvzKgrsYpuLWalOkdhNP+1jluhCA==", + "workspaces": [ + "./packages/scanner", + "./packages/abbreviation", + "./packages/css-abbreviation", + "./" + ], "dependencies": { "@emmetio/abbreviation": "^2.3.3", "@emmetio/css-abbreviation": "^2.1.8" @@ -508,9 +512,9 @@ "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==" }, "node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -609,24 +613,24 @@ "integrity": "sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==" }, "node_modules/typescript-auto-import-cache": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz", - "integrity": "sha512-+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz", + "integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==", "dependencies": { "semver": "^7.3.8" } }, "node_modules/volar-service-css": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.50.tgz", - "integrity": "sha512-x2KkGRBY4IRarIFrBrR5CcynNSPv8oviYgekQvKVBtJdll00jOkstnArNa6h0x0k06bJ1WFB/i9Nd3L+WgtcMg==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.56.tgz", + "integrity": "sha512-Pdbk5QayLNWJislbik4Lo0QLLyd4pTqcgZCE2gaEQp9ozHCtrRNj3vY7KAh4BTgfiOqTSAj/UhViOXVAtdF3yg==", "dependencies": { - "vscode-css-languageservice": "^6.2.10", + "vscode-css-languageservice": "^6.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -635,17 +639,17 @@ } }, "node_modules/volar-service-emmet": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.50.tgz", - "integrity": "sha512-W70iT0lkiyERXTTQMgQhRP0fqW0JO2Kn4JUWvWTLblRvYPKJ7MxWQKwVQN+ng3L9U6fZCkrd2P3FN00Tl8M4Qw==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.56.tgz", + "integrity": "sha512-2WqvOMTYBOpNAHtEWj0C9d8Wyco8aY4KL+9lfdFCWJd7RYU6R6mIlbrvcdSP2De8b5Z7gwTCUm6Kcjt8qOCvjQ==", "dependencies": { "@emmetio/css-parser": "^0.4.0", "@emmetio/html-matcher": "^1.3.0", - "@vscode/emmet-helper": "^2.9.2", + "@vscode/emmet-helper": "^2.9.3", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -654,16 +658,16 @@ } }, "node_modules/volar-service-html": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.50.tgz", - "integrity": "sha512-pcyQo1Pzxp5O27CIt66KjussUnKDmlTmI23L8DABOr7U7uNHV5bqzcDE8dOTHP2Jf5d0+TKAaUSWY9g5BcziQQ==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.56.tgz", + "integrity": "sha512-OwDRiASNqFxAFdO55CZ0/XKnPt7WGw8CoaM/g6QzExikPZ92ySbK/kvh1zi6WR3w+hP6C4BNeVITzOk9tjgNGw==", "dependencies": { - "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -672,15 +676,15 @@ } }, "node_modules/volar-service-json": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.50.tgz", - "integrity": "sha512-u/DSm8N9fMnIeD+FyXYKElqK3C2c2PGs7cW1evk9tRzT53cJmoDDtca3P1AdqKl4ZpomKEOA9MfXvQFashzpvw==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-json/-/volar-service-json-0.0.56.tgz", + "integrity": "sha512-eYXfOYTJLOw9UeA2YNtxGp/Lgu4pKk9u72I/HI+TcqLdMJKoXpOwLF6nUEhZVTy9LqTSRF0QvgXFa4q4mcLwIg==", "dependencies": { - "vscode-json-languageservice": "^5.3.7", + "vscode-json-languageservice": "^5.4.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -689,27 +693,28 @@ } }, "node_modules/volar-service-pug": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.50.tgz", - "integrity": "sha512-z9TFeHnNDhJNyQCL7KinVMpmNaPDo86odG1nG4ysn8D0uMKD/E1m7Qe5sttaKPyx8nywhQKWBYZTPsVuoIB9fQ==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-pug/-/volar-service-pug-0.0.56.tgz", + "integrity": "sha512-NaobSQiuAFBTzBE7YHAyHyCZXqVNFFbXvuXTtXsJP6LR1lvBWg7IUgg45kzV1OS146qq2cmY3lryhlNRHwCmmg==", "dependencies": { - "@volar/language-service": "~2.3.0-alpha.5", + "@volar/language-service": "~2.4.0-alpha.1", + "muggle-string": "^0.4.1", "pug-lexer": "^5.0.1", "pug-parser": "^6.0.0", - "volar-service-html": "0.0.50", - "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "volar-service-html": "0.0.56", + "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/volar-service-pug-beautify": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.50.tgz", - "integrity": "sha512-xzTBsjglVpNWyH8auUznE9EDL57RavwoldjRlxkgV2vppQXvRl8S5dXihGxkcW+/lrV6xaDCckuf7kcmd0osqA==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-pug-beautify/-/volar-service-pug-beautify-0.0.56.tgz", + "integrity": "sha512-ai79ljMfKH2bjcVjUET0zAwpVjDNtMCjizkttxCkNHCMTYIc1muhHIEj1+nNAw4zrDT51lxZgW6OJMTXQ+BW9A==", "dependencies": { "@johnsoncodehk/pug-beautify": "^0.2.2" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -718,19 +723,19 @@ } }, "node_modules/volar-service-typescript": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.50.tgz", - "integrity": "sha512-2QNEtBtZ0dA1WfITavj+7fFCzVCqkpgTgDI8uxMHkWuqMfkETPlYz04603TG1/KOQ1dO2THW8zj4OXDJFmdYXQ==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.56.tgz", + "integrity": "sha512-p16fn61j4IiNLhLl7ZxdnRRDpRLWiqIRhZm1xLgek4JshCCy5Z7KShYG6LVZXK3hNvXxM8f61PIl0KDCCzStKA==", "dependencies": { "path-browserify": "^1.0.1", - "semver": "^7.5.4", - "typescript-auto-import-cache": "^0.3.1", + "semver": "^7.6.2", + "typescript-auto-import-cache": "^0.3.3", "vscode-languageserver-textdocument": "^1.0.11", "vscode-nls": "^5.2.0", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -739,14 +744,14 @@ } }, "node_modules/volar-service-typescript-twoslash-queries": { - "version": "0.0.50", - "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.50.tgz", - "integrity": "sha512-8fYdKlONEl4rU51Wf6qYM4rTFOHvVIhZ1oa9ZmI/tDQIYvK+JSwvov2IPfTVfHmqTet/aS4njmKa0D25CgKuGA==", + "version": "0.0.56", + "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.56.tgz", + "integrity": "sha512-VqOp3xQucUzLpJCOEQcAiAUlbv6c1laTbFsM/pc06S/+l78eHPDbnivoSwL+0MKbNoLwLsS5w0OwBfwQ2Dn2Jg==", "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.3.0-alpha.5" + "@volar/language-service": "~2.4.0-alpha.1" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -755,9 +760,9 @@ } }, "node_modules/vscode-css-languageservice": { - "version": "6.2.14", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz", - "integrity": "sha512-5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz", + "integrity": "sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.11", @@ -766,10 +771,9 @@ } }, "node_modules/vscode-html-languageservice": { - "name": "@johnsoncodehk/vscode-html-languageservice", - "version": "5.2.0-34a5462", - "resolved": "https://registry.npmjs.org/@johnsoncodehk/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0-34a5462.tgz", - "integrity": "sha512-etqLfpSJ5zaw76KUNF603be6d6QsiQPmaHr9FKEp4zhLZJzWCCMH6Icak7MtLUFLZLMpL761mZNImi/joBo1ZA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz", + "integrity": "sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.11", @@ -778,21 +782,21 @@ } }, "node_modules/vscode-json-languageservice": { - "version": "5.3.11", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.11.tgz", - "integrity": "sha512-WYS72Ymria3dn8ZbjtBbt5K71m05wY1Q6hpXV5JxUT0q75Ts0ljLmnZJAVpx8DjPgYbFD+Z8KHpWh2laKLUCtQ==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.0.tgz", + "integrity": "sha512-NCkkCr63OHVkE4lcb0xlUAaix6vE5gHQW4NrswbLEh3ArXj81lrGuFTsGEYEUXlNHdnc53vWPcjeSy/nMTrfXg==", "dependencies": { "@vscode/l10n": "^0.0.18", - "jsonc-parser": "^3.2.1", + "jsonc-parser": "^3.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-languageserver-types": "^3.17.5", "vscode-uri": "^3.0.8" } }, "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==" }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index d18ac720c6aaa..07f305f0160a0 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "vue-language-server"; - version = "2.0.21"; + version = "2.0.24"; src = fetchurl { url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz"; - hash = "sha256-FTsLvSZr+03o8h/udMfcUGBK41/xkrNeMUuOliataH8="; + hash = "sha256-uEYDg4Sybqodb2/w2mmZqi0uWffBzSSTvttcNWt01MI="; }; - npmDepsHash = "sha256-wYrLN42If6gAjRok0tAdVvVoDmv5oK/vvPoT3BxtgdA="; + npmDepsHash = "sha256-6idBvR+Ua6uwwX4doB1X8ERqgBI5bJ6e9G13JhPUFP4="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index a03f3617d2ff7..73639236526fd 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://thelettervsixtim.es"; license = licenses.unfree; - maintainers = with maintainers; [ martfont ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index 596d1d0752197..5fcbcfa64259d 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -4,6 +4,8 @@ , pkg-config , sqlite , zstd +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { @@ -26,6 +28,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration ]; env = { diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix index 02498c4e520a1..762a4eb8e8915 100644 --- a/pkgs/by-name/wb/wb32-dfu-updater/package.nix +++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/WestberryTech/wb32-dfu-updater"; license = licenses.asl20; - maintainers = [ maintainers.liketechnik ]; + maintainers = [ ]; mainProgram = "wb32-dfu-updater_cli"; platforms = platforms.all; }; diff --git a/pkgs/by-name/we/web-archives/package.nix b/pkgs/by-name/we/web-archives/package.nix new file mode 100644 index 0000000000000..2c052474489bc --- /dev/null +++ b/pkgs/by-name/we/web-archives/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + meson, + ninja, + vala, + pkg-config, + wrapGAppsHook3, + libzim-glib, + sqlite, + webkitgtk_4_1, + tracker, + libxml2, + libisocodes, + libhandy, + glib-networking, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "web-archives"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "birros"; + repo = "web-archives"; + rev = "v${finalAttrs.version}"; + hash = "sha256-EYHChI+4tpjRp4KveHTB+5BSLtw0YLp5z2JJmA0xTlM="; + }; + + web-archive-darkreader = fetchurl { + # This is the same with build-aux/darkreader/Makefile + url = "https://github.com/birros/web-archives-darkreader/releases/download/v0.0.1/web-archives-darkreader_v0.0.1.js"; + hash = "sha256-juhAqs2eCYZKerLnX3NvaW3NS0uOhqB7pyf/PRDvMqE="; + }; + + postPatch = '' + substituteInPlace meson.build \ + --replace-fail \ + "'make', '-C', 'build-aux/darkreader'" \ + "'cp', '${finalAttrs.web-archive-darkreader}', 'build-aux/darkreader/web-archives-darkreader.js'" + ''; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = [ + libzim-glib + sqlite + webkitgtk_4_1 + tracker + libxml2 + libisocodes + libhandy + glib-networking + ]; + + strictDeps = true; + + passthru = { + inherit (finalAttrs) web-archive-darkreader; + }; + + meta = { + description = "Web archives reader offering the ability to browse offline millions of articles"; + homepage = "https://github.com/birros/web-archives"; + license = lib.licenses.gpl3Plus; + mainProgram = "web-archives"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 35d1773bec881..282dcc25d0b6b 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "2.6.2"; + version = "2.6.4"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-jZNypjCmMlDAthoLJiV/82vUbugGi4vP5SNZbasG7YE="; + hash = "sha256-dm4rzAP/sp6j8aCsZJbf7TBx7pmjetP2374IAury+kg="; }; - vendorHash = "sha256-x64PKLLkvHKW6lbxWSfAQ5xVy6JpGbCAslfz1seUQ2g="; + vendorHash = "sha256-3p8zoZyH042jmhOD6WGGcHnHhLqm7gMnlaiRZu1OWmE="; proxyVendor = true; diff --git a/pkgs/by-name/wi/wifi-qr/package.nix b/pkgs/by-name/wi/wifi-qr/package.nix index 341077edaefa9..3c5a37b071b88 100644 --- a/pkgs/by-name/wi/wifi-qr/package.nix +++ b/pkgs/by-name/wi/wifi-qr/package.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , installShellFiles , makeWrapper -, gnome +, zenity , ncurses , networkmanager , patsh @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { }; buildInputs = [ - gnome.zenity + zenity ncurses networkmanager procps diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index cf794ea444737..bd83004830529 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wiremock"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar"; - hash = "sha256-8nP+Qv+QZjyG0VcaBd22UIiEYsfPq/D13c+KT2700Vk="; + hash = "sha256-cEsa2xg8ZDb5/LQO5Gj+LCuV18D+LbEK7nrGT+cm158="; }; dontUnpack = true; diff --git a/pkgs/by-name/wo/wordlists/package.nix b/pkgs/by-name/wo/wordlists/package.nix index 0b1b7cc616220..2d7b43b3894fd 100644 --- a/pkgs/by-name/wo/wordlists/package.nix +++ b/pkgs/by-name/wo/wordlists/package.nix @@ -68,6 +68,6 @@ in symlinkJoin { If you want to add a new package that provides wordlist/s the convention is to copy it to {file}`$out/share/wordlists/myNewWordlist`. ''; - maintainers = with maintainers; [ janik pamplemousse h7x4 ]; + maintainers = with maintainers; [ pamplemousse h7x4 ]; }; } diff --git a/pkgs/by-name/xi/xivlauncher/deps.nix b/pkgs/by-name/xi/xivlauncher/deps.nix index 4f8e95ba382f0..fa65ff3a7d1f3 100644 --- a/pkgs/by-name/xi/xivlauncher/deps.nix +++ b/pkgs/by-name/xi/xivlauncher/deps.nix @@ -10,8 +10,6 @@ (fetchNuGet { pname = "goaaats.Steamworks"; version = "2.3.4"; sha256 = "1khxkkjvh6af60rxc13bacxn85amdfzr8z0b9a6gfg6m1fnmlkss"; }) (fetchNuGet { pname = "ImGui.NET"; version = "1.87.2"; sha256 = "0rv0n18fvz1gbh45crhzn1f8xw8zkc8qyiyj91vajjcry8mq1x7q"; }) (fetchNuGet { pname = "KeySharp"; version = "1.0.5"; sha256 = "1ic10v0a174fw6w89iyg4yzji36bsj15573y676cj5n09n6s75d4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) @@ -22,9 +20,6 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; }) (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"; }) diff --git a/pkgs/by-name/xi/xivlauncher/package.nix b/pkgs/by-name/xi/xivlauncher/package.nix index 064bce81d8d9c..86fb36532711f 100644 --- a/pkgs/by-name/xi/xivlauncher/package.nix +++ b/pkgs/by-name/xi/xivlauncher/package.nix @@ -3,7 +3,7 @@ , useSteamRun ? true }: let - rev = "1.0.9"; + rev = "1.1.0"; in buildDotnetModule rec { pname = "XIVLauncher"; @@ -13,7 +13,7 @@ in owner = "goatcorp"; repo = "XIVLauncher.Core"; inherit rev; - hash = "sha256-UOKJMQPule0swwm5p6OPcOt1SYHji2J4MWvN6nGkj/M="; + hash = "sha256-vf9cGY+JvMBpQliS1LDmbWjtAbXByrIeXThKtJGQrO8="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ in # please do not unpin these even if they match the defaults, xivlauncher is sensitive to .NET versions dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetFlags = [ "-p:BuildHash=${rev}" @@ -52,7 +52,7 @@ in }).run; in '' substituteInPlace $out/bin/XIVLauncher.Core \ - --replace 'exec' 'exec ${steam-run}/bin/steam-run' + --replace-fail 'exec' 'exec ${steam-run}/bin/steam-run' '') + '' wrapProgram $out/bin/XIVLauncher.Core --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" # the reference to aria2 gets mangled as UTF-16LE and isn't detectable by nix: https://github.com/NixOS/nixpkgs/issues/220065 diff --git a/pkgs/by-name/xs/xsct/package.nix b/pkgs/by-name/xs/xsct/package.nix index 8e384f8ef9784..20bcbd76f71ed 100644 --- a/pkgs/by-name/xs/xsct/package.nix +++ b/pkgs/by-name/xs/xsct/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xsct"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "faf0"; repo = "sct"; - rev = finalAttrs.version; - hash = "sha256-PDkbZTtl14wYdfALv43SIU9MKhbfiYlRqkI1mFn1qa4="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-L93Gk7/jcRoUWogWhrOiBvWCCj+EbyGKxBR5oOVjPPU="; }; buildInputs = [ @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Set color temperature of screen"; mainProgram = "xsct"; homepage = "https://github.com/faf0/sct"; + changelog = "https://github.com/faf0/sct/blob/${finalAttrs.version}/CHANGELOG"; license = licenses.unlicense; maintainers = with maintainers; [ OPNA2608 ]; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix new file mode 100644 index 0000000000000..bf8f60dc095fe --- /dev/null +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -0,0 +1,56 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, xwayland +, xcb-util-cursor +, libxcb +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "xwayland-satellite"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "Supreeeme"; + repo = "xwayland-satellite"; + rev = "v${version}"; + hash = "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI="; + }; + + cargoHash = "sha256-nKPSkHbh73xKWNpN/OpDmLnVmA3uygs3a+ejOhwU3yA="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + xwayland + libxcb + xcb-util-cursor + ]; + + # disable Xwayland integration tests which need a running display server + checkFlags = [ + "--exact" + "--skip=copy_from_wayland" + "--skip=copy_from_x11" + "--skip=input_focus" + "--skip=quick_delete" + "--skip=reparent" + "--skip=toplevel_flow" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base"; + homepage = "https://github.com/Supreeeme/xwayland-satellite"; + license = licenses.mpl20; + maintainers = with maintainers; [ if-loop69420 ]; + mainProgram = "xwayland-satellite"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 4e831ec920e4c..ce0f5da6db12b 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-N82s6SEQerAVjtOL4o/AmT184fWKTETmZEpKYt7Piv0="; + hash = "sha256-/5UYweF/+oshJlZaTnbr1TJMYgenRZmb8EZudyxcTU0="; }; - cargoHash = "sha256-1lfkG9SsnnUzEZaIxeMxhaRmLAGLB3J0UMfWXHJcmUo="; + cargoHash = "sha256-BXYegw1Rl8HvUxlBg3xwF3ZJemzJnJZPoPNMXYBgoF0="; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index 77a9b9ad8b5bb..a9b89f1bd8705 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -1,13 +1,14 @@ -{ rustPlatform -, fetchFromGitHub -, lib +{ + rustPlatform, + fetchFromGitHub, + lib, -, installShellFiles -, stdenv -, Foundation -, rust-jemalloc-sys + installShellFiles, + stdenv, + Foundation, + rust-jemalloc-sys, -, nix-update-script + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -25,6 +26,14 @@ rustPlatform.buildRustPackage rec { env.YAZI_GEN_COMPLETIONS = true; + # TODO: remove in the next release + cargoBuildFlags = [ + "-p" + "yazi-fm" + "-p" + "yazi-cli" + ]; + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ rust-jemalloc-sys ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; @@ -44,7 +53,12 @@ rustPlatform.buildRustPackage rec { description = "Blazing fast terminal file manager written in Rust, based on async I/O"; homepage = "https://github.com/sxyazi/yazi"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ xyenon matthiasbeyer linsui ]; + maintainers = with lib.maintainers; [ + xyenon + matthiasbeyer + linsui + eljamm + ]; mainProgram = "yazi"; }; } diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix index 276d0251710b5..a6b2d5ca94987 100644 --- a/pkgs/by-name/ya/yazi/package.nix +++ b/pkgs/by-name/ya/yazi/package.nix @@ -1,89 +1,94 @@ -{ lib -, runCommand -, makeWrapper -, yazi-unwrapped +{ + lib, + formats, + runCommand, + makeWrapper, + + extraPackages ? [ ], + optionalDeps ? [ + jq + poppler_utils + unar + ffmpegthumbnailer + fd + ripgrep + fzf + zoxide + ], + + # deps + file, + yazi-unwrapped, -, withRuntimeDeps ? true -, withFile ? true -, file -, withJq ? true -, jq -, withPoppler ? true -, poppler_utils -, withUnar ? true -, unar -, withFfmpegthumbnailer ? true -, ffmpegthumbnailer -, withFd ? true -, fd -, withRipgrep ? true -, ripgrep -, withFzf ? true -, fzf -, withZoxide ? true -, zoxide -, settings ? { } -, formats -, plugins ? { } -, flavors ? { } -, initLua ? null + # optional deps + jq, + poppler_utils, + unar, + ffmpegthumbnailer, + fd, + ripgrep, + fzf, + zoxide, + + settings ? { }, + plugins ? { }, + flavors ? { }, + initLua ? null, }: let - runtimePaths = with lib; - [ ] - ++ optional withFile file - ++ optional withJq jq - ++ optional withPoppler poppler_utils - ++ optional withUnar unar - ++ optional withFfmpegthumbnailer ffmpegthumbnailer - ++ optional withFd fd - ++ optional withRipgrep ripgrep - ++ optional withFzf fzf - ++ optional withZoxide zoxide; + runtimePaths = [ file ] ++ optionalDeps ++ extraPackages; settingsFormat = formats.toml { }; - files = [ "yazi" "theme" "keymap" ]; + files = [ + "yazi" + "theme" + "keymap" + ]; - configHome = if (settings == { } && initLua == null && plugins == { } && flavors == { }) then null else - runCommand "YAZI_CONFIG_HOME" { } '' - mkdir -p $out - ${lib.concatMapStringsSep - "\n" - (name: lib.optionalString (settings ? ${name} && settings.${name} != { }) '' - ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml - '') - files} + configHome = + if (settings == { } && initLua == null && plugins == { } && flavors == { }) then + null + else + runCommand "YAZI_CONFIG_HOME" { } '' + mkdir -p $out + ${lib.concatMapStringsSep "\n" ( + name: + lib.optionalString (settings ? ${name} && settings.${name} != { }) '' + ln -s ${settingsFormat.generate "${name}.toml" settings.${name}} $out/${name}.toml + '' + ) files} - mkdir $out/plugins - ${lib.optionalString (plugins != { }) '' - ${lib.concatStringsSep - "\n" - (lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins)} - ''} + mkdir $out/plugins + ${lib.optionalString (plugins != { }) '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: "ln -s ${value} $out/plugins/${name}") plugins + )} + ''} - mkdir $out/flavors - ${lib.optionalString (flavors != { }) '' - ${lib.concatStringsSep - "\n" - (lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors)} - ''} + mkdir $out/flavors + ${lib.optionalString (flavors != { }) '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: "ln -s ${value} $out/flavors/${name}") flavors + )} + ''} - ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"} - ''; + ${lib.optionalString (initLua != null) "ln -s ${initLua} $out/init.lua"} + ''; in -if (!withRuntimeDeps && configHome == null) then yazi-unwrapped else runCommand yazi-unwrapped.name -{ - inherit (yazi-unwrapped) pname version meta; + { + inherit (yazi-unwrapped) pname version meta; - nativeBuildInputs = [ makeWrapper ]; -} '' - mkdir -p $out/bin - ln -s ${yazi-unwrapped}/share $out/share - makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ - ${lib.optionalString withRuntimeDeps "--prefix PATH : \"${lib.makeBinPath runtimePaths}\""} \ - ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"} -'' + nativeBuildInputs = [ makeWrapper ]; + } + '' + mkdir -p $out/bin + ln -s ${yazi-unwrapped}/share $out/share + ln -s ${yazi-unwrapped}/bin/ya $out/bin/ya + makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ + --prefix PATH : ${lib.makeBinPath runtimePaths} \ + ${lib.optionalString (configHome != null) "--set YAZI_CONFIG_HOME ${configHome}"} + '' diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/by-name/ye/yelp-xsl/package.nix index e440df2423bf3..572f68a923a84 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/by-name/ye/yelp-xsl/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/by-name/ye/yelp/package.nix index c5bb44b46f015..7d9549d970930 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/by-name/ye/yelp/package.nix @@ -8,12 +8,14 @@ , libhandy , glib , gnome +, adwaita-icon-theme , sqlite , itstool , libxml2 , libxslt , gst_all_1 , wrapGAppsHook3 +, yelp-xsl }: stdenv.mkDerivation rec { @@ -40,8 +42,8 @@ stdenv.mkDerivation rec { sqlite libxml2 libxslt - gnome.yelp-xsl - gnome.adwaita-icon-theme + yelp-xsl + adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 9695dd3e0a8fb..91435544c84da 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.2.34646"; + version = "2024.2.35942"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-9htjtB1TC+p+eETsXH5B36NKnZsFA/Og/PIW9gHQefc="; + hash = "sha256-JK6MQ2M+isJz/kCbJAtJ4ADZkkixzXehTORl7n/4QDk="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/by-name/ze/zenity/package.nix index aa98b8c833205..b9e43a42b27b1 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/by-name/ze/zenity/package.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "zenity"; - attrPath = "gnome.zenity"; }; }; diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 9ba51b15abad3..9cdbf06294cae 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.9"; + version = "60.1"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-1TmJHksFeiDjkIslA9FAZrWElgfCV1HOtS7H2pq8sHY="; + hash = "sha256-XvT1Ldle1RqSuMJEG+DuVaUx3MWEDqpEmgQC9L9zqE4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix index dfdf0ce3072f4..4a51af0abefbd 100644 --- a/pkgs/by-name/zw/zwave-js-server/package.nix +++ b/pkgs/by-name/zw/zwave-js-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "zwave-js-server"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = pname; rev = version; - hash = "sha256-9TUS8m3Vizs36GVYaDQTRXPO8zLLJUs8RPkArRRCqsw="; + hash = "sha256-+GyQy7CVd3t98kUDTpPzmPs5WNU8Ct/e+kHPh08gb0Q="; }; - npmDepsHash = "sha256-zTcN04g7EsLFCA+rdqhSQMy06NoMFYCyiUxe9ck2kIE="; + npmDepsHash = "sha256-u9Y9yOLZZ+DnFYAAhF0SUa+qW+Mj+3duzAKKS6xCkp0="; # For some reason the zwave-js dependency is in devDependencies npmFlags = [ "--include=dev" ]; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 7d4bae07081fa..85011eaf4da7c 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.3.0"; + version = "30.3.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-GzIyDQchi8o4CGQexkQez2sqqI0IEBy/nppqyXlad8U="; + hash = "sha256-qT7wk8xIGFC44T1W5En9fbebJnwq/3tnwoT87nkmMmY="; }; - npmDepsHash = "sha256-SKYxEilEvNu+Tc6ytEjjfE5gl1hFiIoE9YP7IwaDzKg="; + npmDepsHash = "sha256-VguAsHX1eWivSd5UhkY0+Pvrh4xxqDn87PI2klC+Xfk="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index a185160d4a3e9..17405d7b78e17 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, adwaita-icon-theme, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenvNoCC.mkDerivation rec { pname = "arc-icon-theme"; @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ moka-icon-theme - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 8433d58795be2..84cb4fb7c54e4 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, adwaita-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pantheon.elementary-icon-theme - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix index 87ec255d9d4aa..dd52c984b1b56 100644 --- a/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, gtk3, gnome, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchurl, gtk3, adwaita-icon-theme, hicolor-icon-theme }: stdenvNoCC.mkDerivation rec { pname = "humanity-icon-theme"; @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index ae5a43eca0b35..d502fb0d6f954 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, adwaita-icon-theme, gnome-icon-theme, hicolor-icon-theme, jdupes }: stdenvNoCC.mkDerivation rec { pname = "paper-icon-theme"; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/data/icons/tau-hydrogen/default.nix index cbd9bf1f663cb..e883d97b587e2 100644 --- a/pkgs/data/icons/tau-hydrogen/default.nix +++ b/pkgs/data/icons/tau-hydrogen/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tau-hydrogen"; - version = "1.0.14"; + version = "1.0.16"; src = fetchFromGitHub { owner = "tau-OS"; repo = "tau-hydrogen"; rev = finalAttrs.version; - hash = "sha256-8awcowBm0hwoYYm/wtKeqCWRhgXh2rI3UvAlL1tbj6c="; + hash = "sha256-nnQ0lkHtkOjJhF4NSMqjt0deddYjMnHHlANlHoZS2wY="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index e263b38146cd2..ff9684910bd3d 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "a71af8d538cda614baa0bcb3e44600061f815d57", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a71af8d538cda614baa0bcb3e44600061f815d57.tar.gz", - "sha256": "0hsqzdfb89rqmplipz39x7m80czcvrmk42y05ifnqjhxn6q4v91l", - "msg": "Update from Hackage at 2024-05-20T16:06:03Z" + "commit": "f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f9ce92cad6df36ec3b9dfc6807c4a1c0426c608e.tar.gz", + "sha256": "01fnkg977fi44v0scijgrp3hq3yrqzw5k8i326a9pz8j6r676iim", + "msg": "Update from Hackage at 2024-06-23T10:38:31Z" } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index c8fb95c87720a..bfd8f589f9e3d 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20240523"; + version = "20240701"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - hash = "sha256-ne/y39KUskzsnw1iBC8EQ62P3GYG+L6pUePlMXCpBsU="; + hash = "sha256-HXOBpy8MRfRzvvpKkvoBCjf8T3srtdH2jgbaRA72kF0="; }; nativeBuildInputs = [ diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/data/soundfonts/generaluser/default.nix index 87753d61ac0e9..f8dd40cd88102 100644 --- a/pkgs/data/soundfonts/generaluser/default.nix +++ b/pkgs/data/soundfonts/generaluser/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://www.schristiancollins.com/generaluser.php"; license = licenses.generaluser; platforms = platforms.all; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/data/soundfonts/ydp-grand/default.nix index 635b445f61153..34f35425410a5 100644 --- a/pkgs/data/soundfonts/ydp-grand/default.nix +++ b/pkgs/data/soundfonts/ydp-grand/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html"; license = licenses.cc-by-30; platforms = platforms.all; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 17089285f2762..2a737d677b0ea 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -5,6 +5,7 @@ , ninja , glib , gnome +, gnome-themes-extra , gtk-engine-murrine , inkscape , cinnamon @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ - gnome.gnome-themes-extra + gnome-themes-extra gtk-engine-murrine ]; diff --git a/pkgs/data/themes/ayu-theme-gtk/default.nix b/pkgs/data/themes/ayu-theme-gtk/default.nix index 2e8453b097dda..29421c58bff29 100644 --- a/pkgs/data/themes/ayu-theme-gtk/default.nix +++ b/pkgs/data/themes/ayu-theme-gtk/default.nix @@ -2,6 +2,7 @@ , autoreconfHook , fetchFromGitHub , gnome +, gnome-themes-extra , gtk-engine-murrine , gtk3 , inkscape @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ - gnome.gnome-themes-extra + gnome-themes-extra gtk-engine-murrine ]; diff --git a/pkgs/data/themes/base16-schemes/default.nix b/pkgs/data/themes/base16-schemes/default.nix index b910ba8c6cf60..b8b7da40212e1 100644 --- a/pkgs/data/themes/base16-schemes/default.nix +++ b/pkgs/data/themes/base16-schemes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "base16-schemes"; - version = "unstable-2024-01-14"; + version = "unstable-2024-06-21"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "schemes"; - rev = "395074124283df993571f2abb9c713f413b76e6e"; - sha256 = "sha256-9LmwYbtTxNFiP+osqRUbOXghJXpYvyvAwBwW80JMO7s="; + rev = "ef9a4c3c384624694608adebf0993d7a3bed3cf2"; + sha256 = "sha256-9i9IjZcjvinb/214x5YShUDBZBC2189HYs26uGy/Hck="; }; installPhase = '' diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index 5666eded73f0a..8f06327b9706c 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -5,7 +5,7 @@ , librsvg , gtk-engine-murrine , gtk3 -, gnome +, adwaita-icon-theme , gnome-icon-theme , numix-icon-theme-circle , hicolor-icon-theme @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme numix-icon-theme-circle hicolor-icon-theme diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index c4773803e41c6..3b3af2431dd38 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib libxml2 bc ]; - buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 59ba5a80b3db6..e75376dea794f 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-pmUuYD0RPyF5I2p5MBErziehBrfc5MswQVvfwl4ozg8="; + hash = "sha256-xzs5eTNOO27//vfkax4cpKO3xnsjavSNU6tyt8H/dF0="; }; nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/data/themes/marwaita-manjaro/default.nix index e00fe5ff22545..19ff7c18b8a68 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/data/themes/marwaita-manjaro/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "17.0"; + version = "20.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-lNHzO5wxAFL1axLlxefXyJue0Zu6bM53AUNm74IE4y8="; + sha256 = "sha256-rEwSlLnDzW6iaPCf91mhL0PqycJAqm/ZmoRf35fl1RY="; }; buildInputs = [ diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index f42e532b64913..7ccf0fd68b2fb 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -5,6 +5,7 @@ , ninja , sassc , gnome +, gnome-themes-extra , gtk-engine-murrine , gdk-pixbuf , librsvg @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja sassc ]; - buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix index b6b5be1adda06..be8cb6439a48a 100644 --- a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix +++ b/pkgs/data/themes/nixos-bgrt-plymouth/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "BGRT theme with a spinning NixOS logo"; homepage = "https://github.com/helsinki-systems/plymouth-theme-nixos-bgrt"; license = licenses.mit; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/data/themes/qogir-kde/default.nix index b3f914ae975b3..635548c8872fe 100644 --- a/pkgs/data/themes/qogir-kde/default.nix +++ b/pkgs/data/themes/qogir-kde/default.nix @@ -4,18 +4,18 @@ , kdeclarative , plasma-framework , plasma-workspace -, gitUpdater +, unstableGitUpdater }: stdenvNoCC.mkDerivation rec { pname = "qogir-kde"; - version = "unstable-2023-10-20"; + version = "0-unstable-2024-06-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "1cfe8da54e6f76d5ce0d2234dcb4f5186431edb3"; - hash = "sha256-Ts8cS7dH8RkfRgWvzDKLCC2G6Hsnvx0NAGstfxMIt+Y="; + rev = "5224dbdeed76c5ed4b7b5ff6d0b48ebe82547228"; + hash = "sha256-qS0bVfweSXv2Sox3cXQ8PfcPD+WA6kwrEoS0ijxWZE8="; }; # Propagate sddm theme dependencies to user env otherwise sddm does @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { description = "Flat Design theme for KDE Plasma desktop"; diff --git a/pkgs/data/themes/sddm-sugar-dark/default.nix b/pkgs/data/themes/sddm-sugar-dark/default.nix new file mode 100644 index 0000000000000..7cbc1c121e3d7 --- /dev/null +++ b/pkgs/data/themes/sddm-sugar-dark/default.nix @@ -0,0 +1,40 @@ +{ pkgs, lib, stdenvNoCC, themeConfig ? null }: + +stdenvNoCC.mkDerivation rec { + pname = "sddm-sugar-dark"; + version = "1.2"; + + src = pkgs.fetchFromGitHub { + owner = "MarianArlt"; + repo = "sddm-sugar-dark"; + rev = "v${version}"; + hash = "sha256-C3qB9hFUeuT5+Dos2zFj5SyQegnghpoFV9wHvE9VoD8="; + }; + + dontWrapQtApps = true; + + buildInputs = with pkgs.libsForQt5.qt5; [ qtgraphicaleffects ]; + + installPhase = + let + iniFormat = pkgs.formats.ini { }; + configFile = iniFormat.generate "" { General = themeConfig; }; + + basePath = "$out/share/sddm/themes/sugar-dark"; + in + '' + mkdir -p ${basePath} + cp -r $src/* ${basePath} + '' + lib.optionalString (themeConfig != null) '' + ln -sf ${configFile} ${basePath}/theme.conf.user + ''; + + meta = { + description = "Dark SDDM theme from the sugar family"; + homepage = "https://github.com/${src.owner}/${pname}"; + license = lib.licenses.gpl3; + + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danid3v ]; + }; +} diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index ea6a9abcb7790..8f945c0d7b862 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , gnome-icon-theme -, gnome +, adwaita-icon-theme , gtk-engine-murrine , gtk3 , hicolor-icon-theme @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome-icon-theme - gnome.adwaita-icon-theme + adwaita-icon-theme humanity-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/data/themes/yaru-remix/default.nix index 87056583b5556..b49236d36e9b6 100644 --- a/pkgs/data/themes/yaru-remix/default.nix +++ b/pkgs/data/themes/yaru-remix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome }: +{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, python3, gtk3, gnome, gnome-themes-extra }: stdenv.mkDerivation rec { pname = "yaru-remix"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome-themes-extra ]; dontDropIconThemeCache = true; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index c49a35e85dab4..d4b074cf33013 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -8,7 +8,7 @@ , ninja , python3 , gtk3 -, gnome +, gnome-themes-extra , gtk-engine-murrine , humanity-icon-theme , hicolor-icon-theme @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome-themes-extra ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 1fb8d86d410e0..015b8ca970833 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -3,7 +3,9 @@ , fetchFromGitHub , substituteAll , accountsservice +, adwaita-icon-theme , budgie-desktop +, cheese , clutter , clutter-gtk , colord @@ -19,6 +21,7 @@ , glibc , gnome , gnome-desktop +, gnome-user-share , gsettings-desktop-schemas , gsound , gtk3 @@ -101,12 +104,12 @@ stdenv.mkDerivation (finalAttrs: { glib glib-networking gnome-desktop - gnome.adwaita-icon-theme - gnome.cheese + adwaita-icon-theme + cheese gnome.gnome-bluetooth_1_0 gnome.gnome-remote-desktop gnome.gnome-settings-daemon - gnome.gnome-user-share + gnome-user-share gnome.mutter gsettings-desktop-schemas gsound diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 9e4ec9c42a2b4..4dc5be53260ec 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -33,6 +33,7 @@ , vala , xfce , wrapGAppsHook3 +, zenity }: stdenv.mkDerivation (finalAttrs: { @@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop gnome.gnome-settings-daemon gnome.mutter - gnome.zenity + zenity graphene gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/budgie/budgie-session/default.nix b/pkgs/desktops/budgie/budgie-session/default.nix index 90185f85b1f09..3815af26c21d3 100644 --- a/pkgs/desktops/budgie/budgie-session/default.nix +++ b/pkgs/desktops/budgie/budgie-session/default.nix @@ -6,6 +6,7 @@ , ninja , pkg-config , gnome +, adwaita-icon-theme , glib , gtk3 , gsettings-desktop-schemas @@ -67,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-desktop json-glib xorg.xtrans - gnome.adwaita-icon-theme + adwaita-icon-theme gnome.gnome-settings-daemon gsettings-desktop-schemas systemd diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index a548b8a6503dd..a2592cb39a399 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,7 +9,6 @@ , cjs , evolution-data-server , fetchFromGitHub -, fetchpatch , gdk-pixbuf , gettext , libgnomekbd @@ -72,25 +71,18 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "6.0.4"; + version = "6.2.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-I0GJv2lcl5JlKPIiWoKMXTf4OLkznS5MpiOIvZ76bJQ="; + hash = "sha256-u5QsUFRXPVsk9T7tVmuOpTaAxdMIJs5yPVcWM1olXz8="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - # Switch to GNOME Online Accounts GTK - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch"; - includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ]; - hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8="; - }) ]; buildInputs = [ @@ -166,6 +158,7 @@ stdenv.mkDerivation rec { --replace-fail 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ --replace-fail "msgfmt" "${gettext}/bin/msgfmt" substituteInPlace ./modules/cs_info.py --replace-fail "lspci" "${pciutils}/bin/lspci" + substituteInPlace ./modules/cs_keyboard.py --replace-fail "/usr/bin/cinnamon-dbus-command" "$out/bin/cinnamon-dbus-command" substituteInPlace ./modules/cs_themes.py --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" popd @@ -178,17 +171,6 @@ stdenv.mkDerivation rec { postInstall = '' # Use locales from cinnamon-translations. ln -s ${cinnamon-translations}/share/locale $out/share/locale - - # Do not install online accounts module, with a -Donlineaccounts=false c-c-c - # this just shows an empty page. - rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py - - # g-o-a-gtk already provides its own desktop item. - rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop - - # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2. - # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8 - rm -r $out/share/cinnamon/styles.d ''; preFixup = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 55ca24d57de0e..b5a98a9090b95 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-AYnI+k6CzpWUutusCSDR5KhOmv5FWoChotAbCJXTh4I="; + hash = "sha256-Blod69RzPTE3DztRo0PK0MKCE+vq0HWrcJcC/1e8eRI="; }; buildInputs = [ @@ -83,8 +83,6 @@ stdenv.mkDerivation rec { mesonFlags = [ # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" - # https://github.com/linuxmint/cinnamon-control-center/issues/326 - "-Donlineaccounts=false" ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 830abafa28538..9bb7b706f02dd 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Ay9JyPBsE345dBwQHChkaGuoXiB2nPyvCNhWWphL8kY="; + hash = "sha256-9uewZh0GHQAenTcZpLchgFXSt3vOhxLbaepsJIkjTdI="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 78a4f7d94b654..7234d00d9c06e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -2,7 +2,7 @@ , runCommand , nixos-artwork , glib -, gnome +, gnome-terminal , gtk3 , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -36,7 +36,7 @@ let cinnamon-session cinnamon-settings-daemon cinnamon-common - gnome.gnome-terminal + gnome-terminal gsettings-desktop-schemas gtk3 ] ++ extraGSettingsOverridePackages; diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index e184e64a889e9..62066ff8dadef 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-zP1jA5Fwxh6QrM5YwJo7SFPWaxkJsv1D84dhIDP5xuI="; + hash = "sha256-HOipeUV9daPSsJ+SHPlsyEAg2SwKQkZBm1JUoNtDZAY="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index f08a242d4665c..f67ba3a2b82ae 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.3"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ncYE2dCIAQxCMCe/5zrDU9iHTIkw+iO/IQl8+pfTvLI="; + hash = "sha256-hXgDTQnOlskzyOogvk7BQ9iJ3oXRtgUUX5bXtgD+gFo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch index 1b56b3903f3bd..368e49bb84aa2 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch +++ b/pkgs/desktops/cinnamon/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch @@ -16,10 +16,10 @@ index d8428dc..1f15115 100644 ] +dbus_glib = dependency('dbus-glib-1') - executable('cinnamon-session', + executable('cinnamon-session-binary', cinnamon_session_sources, dependencies: [ -@@ -74,7 +75,7 @@ executable('cinnamon-session', +@@ -74,7 +75,7 @@ executable('cinnamon-session-binary', xext, xrender, xtest, diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch b/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch deleted file mode 100644 index 6c44f93d8f3c2..0000000000000 --- a/pkgs/desktops/cinnamon/cinnamon-session/0002-Use-login-shell-for-wayland-session.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 174d14edcbb401aa2bfb77932b214512befb486c Mon Sep 17 00:00:00 2001 -From: Bobby Rong <rjl931189261@126.com> -Date: Sat, 23 Dec 2023 23:24:59 +0800 -Subject: [PATCH] cinnamon-session: make sure wayland sessions get a login - shell - -Users expect their shell profiles to get sourced at startup, which -doesn't happen with wayland sessions. - -This commit brings back that feature, by making the cinnamon-session -wrapper script run a login shell. - -ref: https://gitlab.gnome.org/GNOME/gnome-session/-/commit/7e307f8ddb91db5d4051c4c792519a660ba67f35 ---- - cinnamon-session/cinnamon-session.in | 16 ++++++++++++++++ - cinnamon-session/meson.build | 14 +++++++++++++- - 2 files changed, 29 insertions(+), 1 deletion(-) - create mode 100755 cinnamon-session/cinnamon-session.in - -diff --git a/cinnamon-session/cinnamon-session.in b/cinnamon-session/cinnamon-session.in -new file mode 100755 -index 0000000..d9d7cb2 ---- /dev/null -+++ b/cinnamon-session/cinnamon-session.in -@@ -0,0 +1,16 @@ -+#!/bin/sh -+ -+if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && -+ [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && -+ [ -n "$SHELL" ] && -+ grep -q "$SHELL" /etc/shells && -+ ! (echo "$SHELL" | grep -q "false") && -+ ! (echo "$SHELL" | grep -q "nologin"); then -+ if [ "$1" != '-l' ]; then -+ exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" -+ else -+ shift -+ fi -+fi -+ -+exec @libexecdir@/cinnamon-session-binary "$@" -diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build -index 10092ee..3d32fdc 100644 ---- a/cinnamon-session/meson.build -+++ b/cinnamon-session/meson.build -@@ -54,7 +54,7 @@ cinnamon_session_sources = [ - ] - - dbus_glib = dependency('dbus-glib-1') --executable('cinnamon-session', -+executable('cinnamon-session-binary', - cinnamon_session_sources, - dependencies: [ - cinnamon_desktop, -@@ -76,6 +76,18 @@ executable('cinnamon-session', - ], - include_directories: [ rootInclude ], - install: true, -+ install_dir: get_option('libexecdir'), -+) -+ -+script_conf = configuration_data() -+script_conf.set('libexecdir', get_option('prefix') / get_option('libexecdir')) -+ -+configure_file( -+ input: 'cinnamon-session.in', -+ output: 'cinnamon-session', -+ install: true, -+ install_dir: get_option('bindir'), -+ configuration: script_conf - ) - - units = [ --- -2.42.0 - diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 47cedfa0a6f5c..a7262b2f937c4 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -32,18 +32,17 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.0.4"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-GtaoqzcnpKbiP4OqhnLkNWzZTUqX/KgVE6JImNMkdGo="; + hash = "sha256-2KQJNUc/uvbXnqqV0Yt3cltTHNbCo+wK67NXlid02Sk="; }; patches = [ ./0001-Use-dbus_glib-instead-of-elogind.patch - ./0002-Use-login-shell-for-wayland-session.patch ]; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 115ffcdece190..b704f21e294bc 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-bT6NetCBo3J9IiiJ9Hs4iC1N3n/AP9Q+6wZciuKA4i4="; + hash = "sha256-OAG5Tes+0bi+vKqm77Y7OykTpUkMdRaXIJYLuomIDMo="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 0c7f018752a3e..4854cf671bc1d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "6.0.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-kLZ0niamPV5Kaq6ZBTp1SMAl6dKMkcC+rodtAoH5+Go="; + hash = "sha256-U/3+njVctLbu+n/HQ+YuGdGhNN7eWU5u9OEFOz4T69o="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 4ff139ba787e8..bb7ab672dbf0d 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -6,8 +6,10 @@ , cairo , glib , readline -, spidermonkey_102 +, libsysprof-capture +, spidermonkey_115 , meson +, mesonEmulatorHook , dbus , ninja , which @@ -16,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-oSqEAZWEVb8NxFTScl8s5Mb04tCGDyVVslYW00s4YYk="; + hash = "sha256-/74E10txRjwN9RkjVB8M0MPYakJ659yJWanc4DC09wg="; }; outputs = [ "out" "dev" ]; @@ -33,21 +35,24 @@ stdenv.mkDerivation rec { pkg-config which # for locale detection libxml2 # for xml-stripblanks + dbus # for dbus-run-session gobject-introspection + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ cairo readline - spidermonkey_102 - dbus # for dbus-run-session + libsysprof-capture + spidermonkey_115 ]; propagatedBuildInputs = [ glib ]; - mesonFlags = [ + mesonFlags = lib.optionals stdenv.hostPlatform.isMusl [ "-Dprofiler=disabled" ]; diff --git a/pkgs/desktops/cinnamon/mint-l-icons/default.nix b/pkgs/desktops/cinnamon/mint-l-icons/default.nix index 6a3956e53ca96..f1333ee44c18f 100644 --- a/pkgs/desktops/cinnamon/mint-l-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-icons/default.nix @@ -1,7 +1,7 @@ { stdenvNoCC , lib , fetchFromGitHub -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/mint-l-theme/default.nix b/pkgs/desktops/cinnamon/mint-l-theme/default.nix index a9a8a5bd68503..214ebb999785f 100644 --- a/pkgs/desktops/cinnamon/mint-l-theme/default.nix +++ b/pkgs/desktops/cinnamon/mint-l-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-l-theme"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pgb1lkrBRDYgfrLx0/afEuTz+5gZt/IG1u+dn4V7Spo="; + hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index e1e22781690b4..13db58183cb56 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pakD7qVlivokFlIBNjibOkneS6WV4BBOBePWSOjVVy0="; + hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index 8b045980c44a1..e8dbba1c2f1a1 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , lib , stdenvNoCC -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme humanity-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index f12800e384b43..09c01f3e9dfd5 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub , lib , stdenvNoCC -, gnome +, adwaita-icon-theme , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { }; propagatedBuildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 08a9d3bf91b6b..328fe440cde12 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -8,7 +8,6 @@ , desktop-file-utils , egl-wayland , glib -, gnome , gobject-introspection , graphene , gtk3 @@ -36,11 +35,12 @@ , wrapGAppsHook3 , xorgserver , xwayland +, zenity }: stdenv.mkDerivation rec { pname = "muffin"; - version = "6.0.1"; + version = "6.2.0"; outputs = [ "out" "dev" "man" ]; @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-yd23naaPIa6xrdf7ipOvVZKqkr7/CMxNqDZ3CQ2QH+Y="; + hash = "sha256-k8hUYA4/OzL2TB8s5DJpa2nFXV2U9eY09TLkqBDq9WE="; }; patches = [ (substituteAll { src = ./fix-paths.patch; - zenity = gnome.zenity; + inherit zenity; }) ]; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix index 7bf706f83b5f9..3f949c1fea5d4 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/nemo-fileroller/default.nix @@ -7,7 +7,7 @@ , glib , gtk3 , nemo -, gnome +, file-roller , cinnamon-translations }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/nemo-fileroller.c \ - --replace "file-roller" "${lib.getExe gnome.file-roller}" \ + --replace "file-roller" "${lib.getExe file-roller}" \ --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" ''; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix index a5ab9dfe9b3ec..3629b84b4a593 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix @@ -4,12 +4,12 @@ rec { # When you bump this, you should make sure all nemo-extensions # are actually using this file since we try to deal with tags # like nemo-fileroller-5.6.1 according to upstream's wishes. - version = "6.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-zuE0SO5VJ2kKjK7JgsSf+wJgfyffTHhfICslEoPKK8Q="; + sha256 = "sha256-qghGgd+OWYiXvcGUfgiQT6rR4mJPAOfOtYB3lWLg4iA="; }; } diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index fbc12c13dce01..20c067b44ab54 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , glib , gobject-introspection , meson @@ -13,6 +14,8 @@ , cinnamon-desktop , xapp , libexif +, json-glib +, gtk-layer-shell , exempi , intltool , shared-mime-info @@ -22,19 +25,26 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "6.0.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-vSLFp0sgqGsZtcXdv82PVH0HcBbmcxrMySLFCBrLJpA="; + sha256 = "sha256-afK+iJ/WUtcs8Upid4AkbAZAIs/wimHFlXm717U0LHc="; }; patches = [ # Load extensions from NEMO_EXTENSION_DIR environment variable # https://github.com/NixOS/nixpkgs/issues/78327 ./load-extensions-from-env.patch + + # Don't tie the interactive search box with the window's lifetime + # https://github.com/linuxmint/nemo/issues/3423 + (fetchpatch { + url = "https://github.com/linuxmint/nemo/commit/055b47af0e1a830e556989372f3689bbd36b639d.patch"; + hash = "sha256-cMtBz1uLGCV4nnrBITzXAV/SffI0nNcEdeujrHxAzQc="; + }) ]; outputs = [ "out" "dev" ]; @@ -49,6 +59,8 @@ stdenv.mkDerivation rec { exempi gvfs libgsf + json-glib + gtk-layer-shell ]; nativeBuildInputs = [ @@ -64,6 +76,8 @@ stdenv.mkDerivation rec { mesonFlags = [ # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" + # enabled by default in Mint packaging (see debian/rules) + "-Dgtk_layer_shell=true" ]; postInstall = '' diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 2ef940122af0a..613dbe758f24b 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -26,6 +26,7 @@ , gdbm , cyrus_sasl , gnome +, adwaita-icon-theme , librsvg , desktop-file-utils , mtools @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { glib glib-networking gmp - gnome.adwaita-icon-theme + adwaita-icon-theme gtk3 json-glib libapparmor diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix index dd474567196e0..eb3e67a47a69b 100644 --- a/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -20,6 +20,7 @@ , libhandy , webkitgtk , gnome +, adwaita-icon-theme , libxml2 , gsettings-desktop-schemas , tracker @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { gnome-online-accounts gsettings-desktop-schemas evolution-data-server - gnome.adwaita-icon-theme + adwaita-icon-theme ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index f614094d623bf..6f0f2e1d439c7 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -4,6 +4,7 @@ , desktop-file-utils , pkg-config , gnome +, adwaita-icon-theme , gtk4 , libadwaita , wrapGAppsHook4 @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { libadwaita gjs libgweather - gnome.adwaita-icon-theme + adwaita-icon-theme geoclue2 gsettings-desktop-schemas ]; diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index 72c1f7b3226c3..636426ac2f37e 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, adwaita-icon-theme, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook3, librsvg }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook3 ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg + gtk3 vte libxml2 gtk-vnc libsecret adwaita-icon-theme librsvg ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mainProgram = "vinagre"; homepage = "https://gitlab.gnome.org/Archive/vinagre"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index b0a74450e81c7..ff8af62727993 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { mainProgram = "caribou-preferences"; homepage = "https://gitlab.gnome.org/Archive/caribou"; license = licenses.lgpl21; - maintainers = teams.gnome.members; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix index 526363a613938..6c63a486eef76 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix @@ -3,6 +3,7 @@ , fetchurl , fetchpatch , gnome +, adwaita-icon-theme , meson , ninja , pkg-config @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { udev libnotify libcanberra-gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme gsettings-desktop-schemas ]; @@ -91,7 +92,7 @@ stdenv.mkDerivation rec { homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; description = "Application that let you manage Bluetooth in the GNOME destkop"; mainProgram = "bluetooth-sendto"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 5d4504b908527..f7aa278fe8cc9 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -6,6 +6,7 @@ , ninja , pkg-config , gnome +, adwaita-icon-theme , glib , gtk3 , gsettings-desktop-schemas @@ -69,7 +70,7 @@ stdenv.mkDerivation rec { gnome-desktop json-glib xorg.xtrans - gnome.adwaita-icon-theme + adwaita-icon-theme gnome.gnome-settings-daemon gsettings-desktop-schemas systemd diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 022021ea6cf73..5cfe889da4aa4 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -1,6 +1,11 @@ { config, pkgs, lib }: -lib.makeScope pkgs.newScope (self: with self; { +# NOTE: New packages should generally go to top-level instead of here! +lib.makeScope pkgs.newScope (self: +let + inherit (self) callPackage; +in +{ updateScript = callPackage ./update.nix { }; # Temporary helper until gdk-pixbuf supports multiple cache files. @@ -8,27 +13,15 @@ lib.makeScope pkgs.newScope (self: with self; { _gdkPixbufCacheBuilder_DO_NOT_USE = callPackage ./gdk-pixbuf-cache-builder.nix { }; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; + libchamplain = pkgs.libchamplain.override { inherit (self) libsoup; }; # ISO installer # installerIso = callPackage ./installer.nix {}; #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; - - baobab = callPackage ./core/baobab { }; - caribou = callPackage ./core/caribou { }; - dconf-editor = callPackage ./core/dconf-editor { }; - - epiphany = callPackage ./core/epiphany { }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution-data-server = callPackage ./core/evolution-data-server { }; - gdm = callPackage ./core/gdm { }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; @@ -43,20 +36,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-control-center = callPackage ./core/gnome-control-center { }; - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome-common = callPackage ./core/gnome-common { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome-keyring = callPackage ./core/gnome-keyring { }; - - libgnome-keyring = callPackage ./core/libgnome-keyring { }; - gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; gnome-online-miners = callPackage ./core/gnome-online-miners { }; @@ -71,8 +50,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; # Using 43 to match Mutter used in Pantheon @@ -80,27 +57,13 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-software = callPackage ./core/gnome-software { }; - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome-terminal = callPackage ./core/gnome-terminal { }; - - gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnomeSupport = true; }; - eog = callPackage ./core/eog { }; - mutter = callPackage ./core/mutter { }; # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided mutter43 = callPackage ./core/mutter/43 { }; - nautilus = callPackage ./core/nautilus { }; - networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = true; }; @@ -127,35 +90,10 @@ lib.makeScope pkgs.newScope (self: with self; { nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; - rygel = callPackage ./core/rygel { }; - - simple-scan = callPackage ./core/simple-scan { }; - - sushi = callPackage ./core/sushi { }; - - totem = callPackage ./core/totem { }; - - yelp = callPackage ./core/yelp { }; - - yelp-xsl = callPackage ./core/yelp-xsl { }; - - zenity = callPackage ./core/zenity { }; - - #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - accerciser = callPackage ./apps/accerciser { }; - - cheese = callPackage ./apps/cheese { }; - - file-roller = callPackage ./apps/file-roller { }; - - ghex = callPackage ./apps/ghex { }; - gnome-boxes = callPackage ./apps/gnome-boxes { }; - gnome-calendar = callPackage ./apps/gnome-calendar { }; - gnome-characters = callPackage ./apps/gnome-characters { }; gnome-clocks = callPackage ./apps/gnome-clocks { }; @@ -178,14 +116,8 @@ lib.makeScope pkgs.newScope (self: with self; { polari = callPackage ./apps/polari { }; - seahorse = callPackage ./apps/seahorse { }; - vinagre = callPackage ./apps/vinagre { }; -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - devhelp = callPackage ./devtools/devhelp { }; - #### Games aisleriot = callPackage ./games/aisleriot { }; @@ -228,10 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - geary = callPackage ./misc/geary { }; - - gitg = callPackage ./misc/gitg { }; - gnome-applets = callPackage ./misc/gnome-applets { }; gnome-flashback = callPackage ./misc/gnome-flashback { }; @@ -240,27 +168,59 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { }; - gnome-tweaks = callPackage ./misc/gnome-tweaks { }; - - gpaste = callPackage ./misc/gpaste { }; - metacity = callPackage ./misc/metacity { }; - nautilus-python = callPackage ./misc/nautilus-python { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; - - pomodoro = callPackage ./misc/pomodoro { }; - - gnome-autoar = callPackage ./misc/gnome-autoar { }; - - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22. gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 + accerciser = lib.warn "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly." pkgs.accerciser; # Added on 2024-06-22. + adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22. + baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22. + cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22. + dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22. + devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22. + eog = lib.warn "The ‘gnome.eog’ was moved to top-level. Please use ‘pkgs.eog’ directly." pkgs.eog; # Added on 2024-06-22. + epiphany = lib.warn "The ‘gnome.epiphany’ was moved to top-level. Please use ‘pkgs.epiphany’ directly." pkgs.epiphany; # Added on 2024-06-22. + evince = lib.warn "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly." pkgs.evince; # Added on 2024-06-13. + evolution-data-server = lib.warn "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly." pkgs.evolution-data-server; # Added on 2024-06-13. + file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. + geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. + ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. + gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. + gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. + gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. + gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. + gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. + gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22. + gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22. + gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. + gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. + gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. + gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. + gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. + gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. + gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22. + gnome-tweaks = lib.warn "The ‘gnome.gnome-tweaks’ was moved to top-level. Please use ‘pkgs.gnome-tweaks’ directly." pkgs.gnome-tweaks; # Added on 2024-06-22. + gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. + gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. + gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. + nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. + nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. + pomodoro = lib.warn "The ‘gnome.pomodoro’ was moved to top-level. Please use ‘pkgs.gnome-pomodoro’ directly." pkgs.gnome-pomodoro; # Added on 2024-06-22. + rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22. + seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22. + simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22. + sushi = lib.warn "The ‘gnome.sushi’ was moved to top-level. Please use ‘pkgs.sushi’ directly." pkgs.sushi; # Added on 2024-06-22. + totem = lib.warn "The ‘gnome.totem’ was moved to top-level. Please use ‘pkgs.totem’ directly." pkgs.totem; # Added on 2024-06-22. + yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # Added on 2024-06-22. + yelp-xsl = lib.warn "The ‘gnome.yelp-xsl’ was moved to top-level. Please use ‘pkgs.yelp-xsl’ directly." pkgs.yelp-xsl; # Added on 2024-06-22. + zenity = lib.warn "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly." pkgs.zenity; # Added on 2024-06-22. + #### Removals anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16 } diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 85b4fc5fca001..035531a5f05ef 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -1,6 +1,5 @@ { lib , callPackage -, callPackages , config }: let @@ -72,7 +71,7 @@ in rec { # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) # Add all manually packaged extensions - (extensions: extensions // (callPackages ./manuallyPackaged.nix {})) + (extensions: extensions // (import ./manuallyPackaged.nix { inherit callPackage; })) # Map the extension UUIDs to readable names (lib.attrValues) (mapReadableNames) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 52b038ccda919..ca96a38313252 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,7 +3,7 @@ , easyeffects , gjs , glib -, gnome +, nautilus , gobject-introspection , gsound , hddtemp @@ -107,7 +107,7 @@ super: lib.trivial.pipe super [ util_linux = util-linux; xdg_utils = xdg-utils; src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; - nautilus_gsettings_path = "${glib.getSchemaPath gnome.nautilus}"; + nautilus_gsettings_path = "${glib.getSchemaPath nautilus}"; }) ]; })) diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix index a866e3797a300..ed862db922fb4 100644 --- a/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook3 +{ lib, stdenv, fetchurl, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3 , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook3 gettext meson itstool vala ninja python3 desktop-file-utils ]; - buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 gsound librsvg adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson_post_install.py diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index 3b976c633e03a..c822d0e80c434 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook3, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config vala meson ninja python3 wrapGAppsHook3 gettext itstool libxml2 appstream-glib desktop-file-utils - gnome.adwaita-icon-theme + adwaita-icon-theme ]; buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index ee9509309e4c4..364b24121c5dd 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, gtk3, wrapGAppsHook3 +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3 , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meson ninja vala pkg-config gettext itstool python3 libxml2 wrapGAppsHook3 desktop-file-utils ]; - buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x build-aux/meson_post_install.py diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix index 75f68731cb3ca..4a7a058491c4e 100644 --- a/pkgs/desktops/gnome/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -4,6 +4,7 @@ , fetchpatch , pkg-config , gnome +, adwaita-icon-theme , gtk3 , wrapGAppsHook3 , librsvg @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { gtk3 librsvg gsound - gnome.adwaita-icon-theme + adwaita-icon-theme ]; passthru = { diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 8c86a4c090a1f..628b3bbfe2175 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -4,6 +4,7 @@ , fetchpatch , pkg-config , gnome +, adwaita-icon-theme , gtk3 , wrapGAppsHook3 , libxml2 @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { wrapGAppsHook3 itstool libxml2 - gnome.adwaita-icon-theme + adwaita-icon-theme pkg-config gettext meson diff --git a/pkgs/desktops/gnome/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix index 4dc3e9eabdb72..5d3edfe121701 100644 --- a/pkgs/desktops/gnome/games/iagno/default.nix +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -4,6 +4,7 @@ , pkg-config , gtk3 , gnome +, adwaita-icon-theme , gdk-pixbuf , librsvg , wrapGAppsHook3 @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme gdk-pixbuf librsvg gsound diff --git a/pkgs/desktops/gnome/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix index 1884fe869122e..c11c325194c3f 100644 --- a/pkgs/desktops/gnome/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook3 +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, adwaita-icon-theme, gdk-pixbuf, librsvg, wrapGAppsHook3 , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook3 itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; postPatch = '' chmod +x build-aux/meson_post_install.py diff --git a/pkgs/desktops/gnome/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix index d867ad4f16a3c..6fd72f4446909 100644 --- a/pkgs/desktops/gnome/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -5,6 +5,7 @@ pkg-config, gtk3, gnome, + adwaita-icon-theme, gdk-pixbuf, librsvg, gsound, @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { vala desktop-file-utils pkg-config - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 itstool gettext diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index fac4a1fb57769..1199cbbf6066e 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -5,6 +5,7 @@ pkg-config, gtk3, gnome, + adwaita-icon-theme, gdk-pixbuf, librsvg, libgnome-games-support, @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { python3 desktop-file-utils pkg-config - gnome.adwaita-icon-theme + adwaita-icon-theme libxml2 itstool gettext diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix index 9eb93bc8bc44a..34dca7091557a 100644 --- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool -, gnome, enchant, isocodes, gsettings-desktop-schemas }: +, gnome, adwaita-icon-theme, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gtkhtml"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config intltool ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme + buildInputs = [ gtk3 adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/lomiri/services/history-service/default.nix b/pkgs/desktops/lomiri/services/history-service/default.nix index 86866db3ce92e..8e386ac5c1a2f 100644 --- a/pkgs/desktops/lomiri/services/history-service/default.nix +++ b/pkgs/desktops/lomiri/services/history-service/default.nix @@ -8,7 +8,7 @@ , dbus , dbus-test-runner , dconf -, gnome +, gnome-keyring , libphonenumber , libqtdbustest , pkg-config @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { dbus dbus-test-runner dconf - gnome.gnome-keyring + gnome-keyring telepathy-mission-control xvfb-run ]; diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix index 15f6ab1679722..652958eeb87ff 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix @@ -13,7 +13,7 @@ , dconf , gettext , glib -, gnome +, gnome-keyring , history-service , libnotify , libphonenumber @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus-test-runner dconf - gnome.gnome-keyring + gnome-keyring telepathy-mission-control xvfb-run ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 7006e66d136c6..4baa57b6c8c10 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -11,7 +11,7 @@ , libXpresent , libXres , libstartup_notification -, gnome +, zenity , glib , gtk3 , mate-desktop @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { libXres libstartup_notification gtk3 - gnome.zenity + zenity mate-desktop mate-settings-daemon ]; postPatch = '' substituteInPlace src/core/util.c \ - --replace-fail 'argvl[i++] = "zenity"' 'argvl[i++] = "${gnome.zenity}/bin/zenity"' + --replace-fail 'argvl[i++] = "zenity"' 'argvl[i++] = "${zenity}/bin/zenity"' ''; env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 2762c0ce36057..db6edf8df3f04 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -5,7 +5,6 @@ , gettext , itstool , glib -, gnome , gtk-layer-shell , gtk3 , libmateweather @@ -13,6 +12,7 @@ , librsvg , libxml2 , dconf +, dconf-editor , mate-desktop , mate-menus , hicolor-icon-theme @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { gtk3 # See https://github.com/mate-desktop/mate-panel/issues/1402 # This is propagated for mate_panel_applet_settings_new and applet's wrapGAppsHook3 - gnome.dconf-editor + dconf-editor ]; # Needed for Wayland support. diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 58a4ba65f1acf..26d3f16a523a5 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -98,14 +98,12 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; elementary-session-settings = callPackage ./desktop/elementary-session-settings { - inherit (gnome) gnome-session gnome-keyring; + inherit (gnome) gnome-session; }; elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; - file-roller-contract = callPackage ./desktop/file-roller-contract { - inherit (gnome) file-roller; - }; + file-roller-contract = callPackage ./desktop/file-roller-contract { }; gala = callPackage ./desktop/gala { }; @@ -236,11 +234,11 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 - evince = pkgs.gnome.evince; # added 2022-03-18 + evince = pkgs.evince; # added 2022-03-18 extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 - file-roller = pkgs.gnome.file-roller; # added 2022-03-12 + file-roller = pkgs.file-roller; # added 2022-03-12 gnome-bluetooth-contract = throw "pantheon.gnome-bluetooth-contract has been removed, abandoned by upstream."; # added 2022-06-30 diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index f609bf6cc060c..14c2244a760ad 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -16,7 +16,7 @@ , xfce4-panel , xfconf , curl -, gnome +, zenity , jq , xclip }: @@ -54,7 +54,7 @@ mkXfceDerivation { # For Imgur upload action # https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51 gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ curl gnome.zenity jq xclip ]} + --prefix PATH : ${lib.makeBinPath [ curl zenity jq xclip ]} ) ''; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 125324c96dac8..2bb2340261c21 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20231112"; + version = "20240317"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-oH1/QZX8cF9sZikP5XpNdfsMepJrgW+uX0OGHhJVbmw="; + sha256 = "sha256-axJQrCHAW90gncUV2bYDezC1VVooTddB/wWRqChIt84="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 3cf038159b323..f7ac2a009658f 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.38"; + version = "0.6.39"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-byoOvJ4SsRxFSbF4SwdDPlXNdMhypOgktnj4CkmAZuU="; + hash = "sha256-eVf1pQJ0mIZURRDK2k6boZUs+m6hu6lbWqKYWSNC5ng="; }; - cargoHash = "sha256-QNykB9tXXlEyJupO5hkSN2ZqBZDwi0kl6IPHxkkaUxo="; + cargoHash = "sha256-H7JorE6Psg/rndYpNMiyxOfsifBEi4l4bk4CvhDRFjE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index a7de840adc8d0..adb2974cc2d59 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -84,21 +84,20 @@ in rm -f $out/lib/libgcc_s.so* '' - # TODO(amjoseph): remove the `libgcc_s.so` symlinks below and replace them - # with a `-L${gccForLibs.libgcc}/lib` in cc-wrapper's - # `$out/nix-support/cc-flags`. See also: - # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130614895 - # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130635982 - # - https://github.com/NixOS/nixpkgs/commit/404155c6acfa59456aebe6156b22fe385e7dec6f - # # move `libgcc_s.so` into its own output, `$libgcc` + # We maintain $libgcc/lib/$target/ structure to make sure target + # strip runs over libgcc_s.so and remove debug references to headers: + # https://github.com/NixOS/nixpkgs/issues/316114 + lib.optionalString enableLibGccOutput ('' # move libgcc from lib to its own output (libgcc) - mkdir -p $libgcc/lib - mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/lib/ - mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/lib/ - ln -s $libgcc/lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ - ln -s $libgcc/lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + mkdir -p $libgcc/${targetPlatformSlash}lib + mv $lib/${targetPlatformSlash}lib/libgcc_s.so $libgcc/${targetPlatformSlash}lib/ + mv $lib/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $libgcc/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so $lib/${targetPlatformSlash}lib/ + ln -s $libgcc/${targetPlatformSlash}lib/libgcc_s.so.${libgcc_s-version-major} $lib/${targetPlatformSlash}lib/ + '' + + lib.optionalString (targetPlatformSlash != "") '' + ln -s ${targetPlatformSlash}lib $libgcc/lib '' # # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 312106f6388c3..68fe8a015c87f 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.11"; + version = "1.21.12"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Qq7pvytpVsdaetaqPwpRtYIf/qxX9aLnM6LW6uHm2dI="; + hash = "sha256-MOaK8nvB8d8jHjq3Tz0X07jVKgicebyqtXO08bgH7U8="; }; strictDeps = true; diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 5991691165126..eb3fe8004aa6d 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -15,12 +15,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - hash = "sha256-ZPHOgozuUij9+4YXZTnn1koddQEQZe/yrpb+OPHO+nA="; + hash = "sha256-pBoLgS/9MLMrc98niI+o2JoJ3gpvhyRY2o9GmVc5hIA="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index c7c119a45b8ae..43f940a846616 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -364,14 +364,14 @@ let patches = [ (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index ffbbe1deb0d4e..9e3a32b298081 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -394,14 +394,14 @@ in let patches = [ (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix index 06972af065c98..5de76c86357bf 100644 --- a/pkgs/development/compilers/llvm/14/default.nix +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -367,14 +367,14 @@ in let patches = [ (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index e50e35b2c4eb0..113c4b850680e 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -420,14 +420,14 @@ in let }) (substitute { src = ../common/libcxxabi/wasm.patch; - replacements = [ + substitutions = [ "--replace-fail" "/cmake/" "/llvm/cmake/" ]; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ (substitute { src = ../common/libcxx/libcxx-0001-musl-hacks.patch; - replacements = [ + substitutions = [ "--replace-fail" "/include/" "/libcxx/include/" ]; }) diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index ff76aad22a718..d58a31bf8bf77 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -20,9 +20,9 @@ # LLVM release information; specify one of these but not both: , gitRelease ? { version = "19.0.0-git"; - rev = "a9ac31910db3975d5e92a6265ab29dafd6a4691d"; - rev-version = "19.0.0-unstable-2024-06-23"; - sha256 = "sha256-MTt2FU84rgu6FqB9aCO6M54VZexoogkdx5RKS1NzSkk="; + rev = "9b9405621bcc55b74d2177c960c21f62cc95e6fd"; + rev-version = "19.0.0-unstable-2024-06-30"; + sha256 = "sha256-Tlk+caav7e7H6bha8YQyOl+x2iNk9iH7xKpHQkWQyJ4="; } # i.e.: # { diff --git a/pkgs/development/compilers/openjdk/info.json b/pkgs/development/compilers/openjdk/info.json index c8f88d7280e4e..d4df70b8597f7 100644 --- a/pkgs/development/compilers/openjdk/info.json +++ b/pkgs/development/compilers/openjdk/info.json @@ -1,8 +1,8 @@ { "22": { - "version": "22-ga", + "version": "22.0.1-ga", "repo": "jdk22u", - "hash": "sha256-itjvIedPwJl/l3a2gIVpNMs1zkbrjioVqbCj1Z1nCJE=" + "hash": "sha256-wCHgharBnvRSB3dWW8C3e80AZtxyFgP0SS5X1d4LzMc=" }, "21": { "version": "21.0.3-ga", diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index fbd808184156d..0b66e0d21a63e 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -60,6 +60,6 @@ in stdenv.mkDerivation rec { # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a2b5cf46b54d6..6676a7ce6c2ee 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,12 +10,12 @@ let versionMap = { - "2.4.4" = { - sha256 = "sha256-ipMmJ7Px2OlhjxzcIl7csAJFaARpfiyH0UBoN2ShBtU="; - }; "2.4.5" = { sha256 = "sha256-TfaOkMkDGAdkK0t2GYjetb9qG9FSxHI0goNO+nNae9E="; }; + "2.4.6" = { + sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index 4eca8e576c2cf..eb12388f84c04 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.5.2"; + version = "5.5.3"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-2BgMzOW9DIIncujAVJ/C8L9aMwDkNaj47cV2JSxCPrw="; + hash = "sha256-2yfF14hR/avl67cOwo+Gr95w2jf+7KYlsMrlBTAKswM="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-/WQgSoklW1szgJ/5iN0Dg+L7BMByvyc+KcvYiQNjGEw="; + npmDepsHash = "sha256-YihnUZgM+74EmImalyTFtp9xyiOOfjZVohDfpcvlSEg="; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index fe577a149d716..c9db564c1941c 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -10,14 +10,15 @@ let { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} { case = "8.18"; out = { version = "1.18.1"; };} - { case = "8.19"; out = { version = "1.18.1"; };} + { case = "8.20"; out = { version = "1.19.2"; };} ] {} ); -in mkCoqDerivation { +in (mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.20"; out = "2.2.0"; } { case = "8.19"; out = "2.0.1"; } { case = "8.18"; out = "2.0.0"; } { case = "8.17"; out = "1.18.0"; } @@ -28,6 +29,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."2.2.0".sha256 = "sha256-rADEoqTXM7/TyYkUKsmCFfj6fjpWdnZEOK++5oLfC/I="; release."2.0.1".sha256 = "sha256-cuoPsEJ+JRLVc9Golt2rJj4P7lKltTrrmQijjoViooc="; release."2.0.0".sha256 = "sha256-A/cH324M21k3SZ7+YWXtaYEbu6dZQq3K0cb1RMKjbsM="; release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ="; @@ -67,6 +69,7 @@ in mkCoqDerivation { buildFlags = [ "OCAMLWARN=" ]; mlPlugin = true; + useDuneifVersion = v: lib.versions.isGe "2.2.0" v || v == "dev"; propagatedBuildInputs = [ coq.ocamlPackages.findlib elpi ]; meta = { @@ -74,4 +77,9 @@ in mkCoqDerivation { maintainers = [ lib.maintainers.cohencyril ]; license = lib.licenses.lgpl21Plus; }; -} +}).overrideAttrs (o: + lib.optionalAttrs (o.version != null + && (o.version == "dev" || lib.versions.isGe "2.2.0" o.version)) + { + propagatedBuildInputs = o.propagatedBuildInputs ++ [ coq.ocamlPackages.ppx_optcomp ]; + }) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 60926e712ad7c..a0598d0bac835 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -8,7 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "2.0.1"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; } { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; } { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; } diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix index a4b85cdd7fbbe..fcc0e2a81dd49 100644 --- a/pkgs/development/coq-modules/coqide/default.nix +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -3,7 +3,7 @@ , copyDesktopItems , wrapGAppsHook3 , glib -, gnome +, adwaita-icon-theme , mkCoqDerivation , coq , version ? null }: @@ -29,7 +29,7 @@ mkCoqDerivation rec { wrapGAppsHook3 coq.ocamlPackages.lablgtk3-sourceview3 glib - gnome.adwaita-icon-theme + adwaita-icon-theme ]; buildPhase = '' diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 23e74f825cb2a..6998ec4459890 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.19") (isGe "2.0.0")] ; out = "0.2.0"; } + { cases = [(range "8.17" "8.20") (isGe "2.0.0")] ; out = "0.2.0"; } { cases = [(range "8.11" "8.20") (isLe "2.0.0")] ; out = "0.1.1"; } ] null; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 57e7caa038333..ba84b953490db 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.17" "8.19") (isGe "2.0.0") ]; out = "0.4.0"; } + { cases = [(range "8.17" "8.20") (isGe "2.0.0") ]; out = "0.4.0"; } { cases = [(range "8.11" "8.20") (range "1.12.0" "1.19.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 6554b811f4b95..94e868c8ebf1c 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ - { cases = [ (isGe "8.16") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } + { cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "0.9.4"; } { cases = [ (range "8.16" "8.18") (range "2.0.0" "2.1.0" ) ]; out = "0.9.3"; } { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index d229f89875b4d..aee4d65b7cfa6 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,7 +5,7 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.18" "8.19"; out = "1.7.0"; } + { case = range "8.18" "8.20"; out = "1.7.0"; } { case = range "8.16" "8.18"; out = "1.6.0"; } { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index d913b34f0f795..3e071850e8eff 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "1.2.3"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "1.2.3"; } { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "1.2.2"; } { cases = [ (range "8.16" "8.19") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 97e8a7698a905..afbd3bd8046ba 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -32,7 +32,7 @@ let defaultVersion = let inherit (lib.versions) range; in lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } + { cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; } { cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; } { cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index d910cfa8d0554..66d237c0a53d4 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "2.1.0"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") (range "2.0" "2.1") ]; out = "2.0.0"; } { cases = [ (range "8.13" "8.20") (range "1.12" "1.19") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index cdd913f6d82b3..f4a2387ee8cc3 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -7,7 +7,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ - { cases = [ (isGe "8.17") (isGe "1.0") ]; out = "0.7.1"; } + { cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; } { cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; } { cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; } { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index ccac363bf2b2e..987990429f37a 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic="; "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; "1.1.4".sha256 = "sha256-8Hs6XfowbpeRD8RhMRf4ZJe2xf8kE0e8m7bPUzR/IM4="; "1.1.3".sha256 = "1vwmmnzy8i4f203i2s60dn9i0kr27lsmwlqlyyzdpsghvbr8h5b7"; @@ -20,7 +21,8 @@ mkCoqDerivation { }; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } + { cases = [ (isGe "8.17") (isGe "2.0.0") ]; out = "2.0.1"; } + { cases = [ (range "8.16" "8.19") (range "2.0.0" "2.2.0") ]; out = "2.0.0"; } { cases = [ (range "8.13" "8.19") (range "1.13.0" "1.19.0") ]; out = "1.1.4"; } { cases = [ (isGe "8.13") (range "1.12.0" "1.18.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (range "1.12.0" "1.18.0") ]; out = "1.1.2"; } diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 38c29f25faa02..8195124668305 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-ssreflect.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.0.2"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.0.2"; } { cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index d6a91944053e5..df7a7e27c93dc 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -29,7 +29,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0") ]; out = "3.2"; } { cases = [ (range "8.12" "8.20") (range "1.12" "1.19") ]; out = "2.4"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index b65d54bc3360a..84f5e718ed050 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } + { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } { cases = [ (range "8.13" "8.20") (range "1.12" "1.19.0") ]; out = "1.3.0+1.12+8.13"; } { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 242841b8fa17f..51accc11d2491 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -23,7 +23,7 @@ let { case = range "8.19" "8.20"; out = "1.19.0"; } { case = range "8.17" "8.18"; out = "1.18.0"; } { case = range "8.15" "8.18"; out = "1.17.0"; } - { case = range "8.16" "8.19"; out = "2.2.0"; } + { case = range "8.16" "8.20"; out = "2.2.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 4326aa9ba2243..89297a6fd0ea5 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.17" "8.19") (isGe "2.1.0") ]; out = "2.2.0"; } + { cases = [ (range "8.17" "8.20") (isGe "2.1.0") ]; out = "2.2.0"; } { cases = [ (range "8.16" "8.18") "2.1.0" ]; out = "2.1.0"; } { cases = [ (range "8.16" "8.18") "2.0.0" ]; out = "2.0.0"; } { cases = [ (isGe "8.15") (range "1.15.0" "1.19.0") ]; out = "1.6.0"; } diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index f1ec4d0fed271..942ba1dc18bd1 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, cvc5, version ? null }: +{ lib, stdenv, pkgs, mkCoqDerivation, coq, veriT, zchaff, fetchurl, cvc5, version ? null }: let # version of veriT that works with SMTCoq @@ -15,6 +15,13 @@ mkCoqDerivation { pname = "smtcoq"; owner = "smtcoq"; + release."SMTCoq-2.2+8.19".sha256 = "sha256-9Wv8AXRRyOHG/cjA/V9tSK55R/bofDMLTkDpuwYWkks="; + release."SMTCoq-2.2+8.18".sha256 = "sha256-1iJAruI5Qn9nTZcUDjk8t/1Q+eFkYLOe9Ee0DmK03w8="; + release."SMTCoq-2.2+8.17".sha256 = "sha256-kaodsyVUl1+QQagzoBTIjxbdD4X3IaaH0x2AsVUL+Z0="; + release."SMTCoq-2.2+8.16".sha256 = "sha256-Hwm8IFlw97YiOY6H63HyJlwIXvQHr9lqc1+PgTnBtkw="; + release."SMTCoq-2.2+8.15".sha256 = "sha256-+GYOasJ32KJyOfqJlTtFmsJ2exd6gdueKwHdeMPErTo="; + release."SMTCoq-2.2+8.14".sha256 = "sha256-jqnF33E/4CqR1HSrLmUmLVCKslw9h3bbWi4YFmFYrhY="; + release."SMTCoq-2.2+8.13".sha256 = "sha256-AVpKU/SLaLYnCnx6GOEPGJjwbRrp28Fs5O50kJqdclI="; release."SMTCoq-2.1+8.16".rev = "4996c00b455bfe98400e96c954839ceea93efdf7"; release."SMTCoq-2.1+8.16".sha256 = "sha256-k53e+frUjwq+ZZKbbOKd/EfVC40QeAzB2nCsGkCKnHA="; release."SMTCoq-2.1+8.14".rev = "e11d9b424b0113f32265bcef0ddc962361da4dae"; @@ -22,14 +29,20 @@ mkCoqDerivation { release."SMTCoq-2.1+8.13".rev = "d02269c43739f4559d83873563ca00daad9faaf1"; release."SMTCoq-2.1+8.13".sha256 = "sha256-VZetGghdr5uJWDwZWSlhYScoNEoRHIbwqwJKSQyfKKg="; + releaseRev = v: v; + inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = isEq "8.16"; out = "SMTCoq-2.1+8.16"; } - { case = isEq "8.14"; out = "SMTCoq-2.1+8.14"; } - { case = isEq "8.13"; out = "SMTCoq-2.1+8.13"; } + { case = isEq "8.19"; out = "SMTCoq-2.2+8.19"; } + { case = isEq "8.18"; out = "SMTCoq-2.2+8.18"; } + { case = isEq "8.17"; out = "SMTCoq-2.2+8.17"; } + { case = isEq "8.16"; out = "SMTCoq-2.2+8.16"; } + { case = isEq "8.15"; out = "SMTCoq-2.2+8.15"; } + { case = isEq "8.14"; out = "SMTCoq-2.2+8.14"; } + { case = isEq "8.13"; out = "SMTCoq-2.2+8.13"; } ] null; - propagatedBuildInputs = [ trakt cvc5 veriT' zchaff ] ++ (with coq.ocamlPackages; [ num zarith ]); + propagatedBuildInputs = [ cvc5 veriT' zchaff ] ++ (with coq.ocamlPackages; [ findlib num zarith ]); mlPlugin = true; nativeBuildInputs = (with pkgs; [ gnumake42 ]) ++ (with coq.ocamlPackages; [ ocamlbuild ]); diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index e79bd4f60f8da..565f83da06d6e 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -1,4 +1,4 @@ -{ metaFetch, mkCoqDerivation, coq, lib, glib, gnome, wrapGAppsHook3, +{ metaFetch, mkCoqDerivation, coq, lib, glib, adwaita-icon-theme, wrapGAppsHook3, version ? null }: let ocamlPackages = coq.ocamlPackages; @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage { src = "${fetched.src}/language-server"; nativeBuildInputs = [ coq ]; buildInputs = - [ coq glib gnome.adwaita-icon-theme wrapGAppsHook3 ] ++ + [ coq glib adwaita-icon-theme wrapGAppsHook3 ] ++ (with ocamlPackages; [ findlib lablgtk3-sourceview3 yojson zarith ppx_inline_test ppx_assert ppx_sexp_conv ppx_deriving ppx_import sexplib diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 5d23d8f7f2a1a..00ebb5535c690 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -44,7 +44,7 @@ filterAndCreateOverrides { }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ - libcublas.lib + libcublas numactl rdma-core ]; @@ -66,17 +66,17 @@ filterAndCreateOverrides { buildInputs = prevAttrs.buildInputs # Always depends on this - ++ [ libcublas.lib ] + ++ [ libcublas ] # Dependency from 12.0 and on - ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ] + ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ] # Dependency from 12.1 and on - ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse.lib ]; + ++ lib.lists.optionals (cudaAtLeast "12.1") [ libcusparse ]; brokenConditions = prevAttrs.brokenConditions // { "libnvjitlink missing (CUDA >= 12.0)" = - !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null)); + !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null)); "libcusparse missing (CUDA >= 12.1)" = - !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse.lib != null)); + !(cudaAtLeast "12.1" -> (libcusparse != null && libcusparse != null)); }; }; @@ -90,16 +90,16 @@ filterAndCreateOverrides { buildInputs = prevAttrs.buildInputs # Dependency from 12.0 and on - ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink.lib ]; + ++ lib.lists.optionals (cudaAtLeast "12.0") [ libnvjitlink ]; brokenConditions = prevAttrs.brokenConditions // { "libnvjitlink missing (CUDA >= 12.0)" = - !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink.lib != null)); + !(cudaAtLeast "12.0" -> (libnvjitlink != null && libnvjitlink != null)); }; }; # TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from - # cuda_nvcc.dev. It would be nice to be able to encode that. + # (getDev cuda_nvcc). It would be nice to be able to encode that. cuda_cudart = { addDriverRunpath, lib }: prevAttrs: { @@ -166,13 +166,17 @@ filterAndCreateOverrides { }; cuda_nvcc = - { - backendStdenv, - cuda_cudart, - lib, - setupCudaHook, - }: + { backendStdenv, setupCudaHook }: prevAttrs: { + # Merge "bin" and "dev" into "out" to avoid circular references + outputs = builtins.filter ( + x: + !(builtins.elem x [ + "dev" + "bin" + ]) + ) prevAttrs.outputs; + # Patch the nvcc.profile. # Syntax: # - `=` for assignment, @@ -230,8 +234,7 @@ filterAndCreateOverrides { }; }; - cuda_nvprof = - { cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ cuda_cupti.lib ]; }; + cuda_nvprof = { cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ cuda_cupti ]; }; cuda_demo_suite = { @@ -245,8 +248,8 @@ filterAndCreateOverrides { prevAttrs: { buildInputs = prevAttrs.buildInputs ++ [ freeglut - libcufft.lib - libcurand.lib + libcufft + libcurand libGLU libglvnd mesa diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 006abb456cdc5..4af16c8921cb2 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -290,42 +290,23 @@ backendStdenv.mkDerivation (finalAttrs: { "libcuda.so.*" ]; - # The out output leverages the same functionality which backs the `symlinkJoin` function in - # Nixpkgs: - # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 - # - # That should allow us to emulate "fat" default outputs without having to actually create them. - # - # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. - postPhases = [ "postPatchelf" ]; + # _multioutPropagateDev() currently expects a space-separated string rather than an array + preFixup = '' + export propagatedBuildOutputs="''${propagatedBuildOutputs[@]}" + ''; - # For each output, create a symlink to it in the out output. - # NOTE: We must recreate the out output here, because the setup hook will have deleted it if it was empty. + # Propagate all outputs, including `static` + propagatedBuildOutputs = builtins.filter (x: x != "dev") finalAttrs.outputs; + + # Kept in case overrides assume postPhases have already been defined + postPhases = [ "postPatchelf" ]; postPatchelf = '' - mkdir -p "$out" - for output in $(getAllOutputNames); do - if [[ "$output" != "out" ]]; then - ${meta.getExe lndir} "''${!output}" "$out" - fi - done + true ''; # Make the CUDA-patched stdenv available passthru.stdenv = backendStdenv; - # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs - # from depending on `out` by default. - # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 - # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. - propagatedBuildOutputs = false; - - # By default, if the dev output exists it just uses that. - # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or - # anything of the sort. To remedy this, we set outputSpecified to true, and use - # outputsToInstall, which tells Nix which outputs to use when the package name is used - # unqualified (that is, without an explicit output). - outputSpecified = true; - meta = { description = "${redistribRelease.name}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}"; sourceProvenance = [ sourceTypes.binaryNativeCode ]; @@ -343,8 +324,5 @@ backendStdenv.mkDerivation (finalAttrs: { lists.optionals isBadPlatform finalAttrs.meta.platforms; license = licenses.unfree; maintainers = teams.cuda.members; - # Force the use of the default, fat output by default (even though `dev` exists, which - # causes Nix to prefer that output over the others if outputSpecified isn't set). - outputsToInstall = [ "out" ]; }; }) diff --git a/pkgs/development/cuda-modules/nccl-tests/default.nix b/pkgs/development/cuda-modules/nccl-tests/default.nix index e1f4eed7fae46..84575234a7691 100644 --- a/pkgs/development/cuda-modules/nccl-tests/default.nix +++ b/pkgs/development/cuda-modules/nccl-tests/default.nix @@ -45,11 +45,11 @@ backendStdenv.mkDerivation (finalAttrs: { [ nccl ] ++ lib.optionals (lib.versionOlder cudaVersion "11.4") [ cudatoolkit ] ++ lib.optionals (lib.versionAtLeast cudaVersion "11.4") [ - cuda_nvcc.dev # crt/host_config.h + cuda_nvcc # crt/host_config.h cuda_cudart ] ++ lib.optionals (lib.versionAtLeast cudaVersion "12.0") [ - cuda_cccl.dev # <nv/target> + cuda_cccl # <nv/target> ] ++ lib.optionals mpiSupport [ mpi ]; diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix index dd767d2781f06..e838bac3abc3c 100644 --- a/pkgs/development/cuda-modules/nccl/default.nix +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -54,7 +54,7 @@ backendStdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals (cudaOlder "11.4") [ cudatoolkit ] ++ lib.optionals (cudaAtLeast "11.4") [ - cuda_nvcc.dev # crt/host_config.h + cuda_nvcc # crt/host_config.h cuda_cudart ] # NOTE: CUDA versions in Nixpkgs only use a major and minor version. When we do comparisons diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index ba65d94a292de..8127385a79d52 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.14"; + version = "0.3.15"; src = fetchCrate { inherit version pname; - hash = "sha256-sTogOCpcfJHy+e3T4pEvclCddCUX+RHCQ238oz5bAEo="; + hash = "sha256-P4XwIJnXnIQcp/l8GR7Mx8ybn1GdtiXVpQcky1JYVuU="; }; - cargoHash = "sha256-lRSt46yxFWSlhU6Pns3PCLJ4c6Fvi4EbOIqVx9IoPCc="; + cargoHash = "sha256-dBqbZWVTrIj2ji7JmLnlglvt4GkKef48kcl/V54thaQ="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fb6f9608b76df..3b0b885ccab4c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -246,6 +246,20 @@ self: super: { }; }) super.leveldb-haskell; + # 2024-06-23: Hourglass is archived and had its last commit 6 years ago. + # Patch is needed to add support for time 1.10, which is only used in the tests + # https://github.com/vincenthz/hs-hourglass/pull/56 + # Jailbreak is needed because a hackage revision added the (correct) time <1.10 bound. + hourglass = doJailbreak + (appendPatches [ + (pkgs.fetchpatch { + name = "hourglass-pr-56.patch"; + url = + "https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch"; + sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q="; + }) + ] super.hourglass); + # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the # store. Testing is done upstream. @@ -393,7 +407,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "sha256-adV7I1P0O/dqH1rEyf3c2Vp4GSiiHReJyqnkSOYQGT0="; + hash = "sha256-D/lvNe2pa1vZvMEsVV4SuwPAJd2Aer0yA3bRae6j3jQ="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -1351,11 +1365,7 @@ self: super: { pkgs.postgresqlTestHook ] super.users-postgresql-simple; - # Need https://github.com/obsidiansystems/gargoyle/pull/45 - gargoyle = doJailbreak super.gargoyle; - gargoyle-postgresql = doJailbreak super.gargoyle-postgresql; - gargoyle-postgresql-nix = doJailbreak (addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix); - gargoyle-postgresql-connect = doJailbreak super.gargoyle-postgresql-connect; + gargoyle-postgresql-nix = addBuildTool [pkgs.postgresql] super.gargoyle-postgresql-nix; # PortMidi needs an environment variable to have ALSA find its plugins: # https://github.com/NixOS/nixpkgs/issues/6860 @@ -1864,8 +1874,6 @@ self: super: { # 2022-06-19: Disable checks because of https://github.com/reflex-frp/reflex/issues/475 reflex = doJailbreak (dontCheck super.reflex); - # 2024-03-02: hspec <2.11, primitive <0.8 - https://github.com/reflex-frp/reflex-vty/pull/80 - reflex-vty = assert super.reflex-vty.version == "0.5.2.0"; doJailbreak super.reflex-vty; # 2024-03-02: vty <5.39 - https://github.com/reflex-frp/reflex-ghci/pull/33 reflex-ghci = assert super.reflex-ghci.version == "0.2.0.1"; doJailbreak super.reflex-ghci; @@ -2049,28 +2057,6 @@ self: super: { # test suite doesn't compile anymore due to changed hunit/tasty APIs fullstop = dontCheck super.fullstop; - crypton-x509 = - lib.pipe - super.crypton-x509 - [ - # Mistype in a dependency in a test. - # https://github.com/kazu-yamamoto/crypton-certificate/pull/3 - (appendPatch - (fetchpatch { - name = "crypton-x509-rename-dep.patch"; - url = "https://github.com/kazu-yamamoto/crypton-certificate/commit/5281ff115a18621407b41f9560fd6cd65c602fcc.patch"; - hash = "sha256-pLzuq+baSDn+MWhtYIIBOrE1Js+tp3UsaEZy5MhWAjY="; - relative = "x509"; - }) - ) - # There is a revision in crypton-x509, so the above patch won't - # apply because of line endings in revised .cabal files. - (overrideCabal { - editedCabalFile = null; - revision = null; - }) - ]; - # * doctests don't work without cabal # https://github.com/noinia/hgeometry/issues/132 # * Too strict version bound on vector-builder @@ -2101,13 +2087,7 @@ self: super: { # Need https://github.com/obsidiansystems/cli-extras/pull/12 and more cli-extras = doJailbreak super.cli-extras; - # https://github.com/obsidiansystems/cli-git/pull/7 turned into a flat patch cli-git = lib.pipe super.cli-git [ - (appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/cli-git/commit/be378a97e2f46522174231b77c952f759df3fad6.patch"; - sha256 = "sha256-6RrhqkKpnb+FTHxccHNx6pdC7ClfqcJ2eoo+W7h+JUo="; - excludes = [ ".github/**" ]; - })) doJailbreak (addBuildTool pkgs.git) ]; @@ -2118,11 +2098,7 @@ self: super: { pkgs.nix-prefetch-git ] (doJailbreak super.cli-nix); - # https://github.com/obsidiansystems/nix-thunk/pull/51/ - nix-thunk = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/nix-thunk/commit/c3dc3e799e8ce7756330f98b9f73f59c4b7a5502.patch"; - sha256 = "sha256-C1ii1FXiCPFfw5NzyQZ0cEG6kIYGohVsnHycpYEJ24Q="; - }) (doJailbreak super.nix-thunk); + nix-thunk = doJailbreak super.nix-thunk; # list `modbus` in librarySystemDepends, correct to `libmodbus` libmodbus = doJailbreak (addExtraLibrary pkgs.libmodbus super.libmodbus); @@ -2290,24 +2266,17 @@ self: super: { # https://github.com/merijn/paramtree/issues/4 paramtree = dontCheck super.paramtree; - # https://github.com/haskell-gi/haskell-gi/issues/431 - haskell-gi = appendPatch (fetchpatch { - url = "https://github.com/haskell-gi/haskell-gi/pull/430/commits/9ee545ad5028e5de8e1e1d96bbba2b9dbab47480.diff"; - hash = "sha256-kh32mZ7EdlOsg7HQILB7Y/EkHIqG/mozbnd/kbP+WDk="; - }) - super.haskell-gi; - # Too strict version bounds on haskell-gi # https://github.com/owickstrom/gi-gtk-declarative/issues/100 gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - gi-gtk_4 = self.gi-gtk_4_0_8; - gi-gtk_4_0_8 = doDistribute (super.gi-gtk_4_0_8.override { + gi-gtk_4 = self.gi-gtk_4_0_9; + gi-gtk_4_0_9 = doDistribute (super.gi-gtk_4_0_9.override { gi-gdk = self.gi-gdk_4; }); - gi-gdk_4 = self.gi-gdk_4_0_7; - gi-gdk_4_0_7 = doDistribute super.gi-gdk_4_0_7; + gi-gdk_4 = self.gi-gdk_4_0_8; + gi-gdk_4_0_8 = doDistribute super.gi-gdk_4_0_8; # GSK is only used for GTK 4. gi-gsk = super.gi-gsk.override { gi-gdk = self.gi-gdk_4; @@ -2317,22 +2286,6 @@ self: super: { gi-gtk = self.gi-gtk_4; }; - # Missing dependency on gi-cairo - # https://github.com/haskell-gi/haskell-gi/pull/420 - gi-vte = - overrideCabal - (oldAttrs: { - # This is implemented as a sed expression instead of pulling a patch - # from upstream because the gi-vte repo doesn't actually contain a - # gi-vte.cabal file. The gi-vte.cabal file is generated from metadata - # in the repo. - postPatch = (oldAttrs.postPatch or "") + '' - sed -i 's/\(gi-gtk == .*\),/\1, gi-cairo == 1.0.*,/' ./gi-vte.cabal - ''; - buildDepends = (oldAttrs.buildDepends or []) ++ [self.gi-cairo]; - }) - super.gi-vte; - # 2023-04-09: haskell-ci needs Cabal-syntax 3.10 # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 # 2024-03-21: pins specific version of ShellCheck @@ -2647,18 +2600,6 @@ self: super: { # 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15 base-noprelude = doJailbreak super.base-noprelude; - # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 - dependent-monoidal-map = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/dependent-monoidal-map/commit/3f8be15fa9bd2796d1c917e9f0979b4d6c62cf91.patch"; - hash = "sha256-QKDUh4jO8xZrThrkjTVNnkoVY+GejxOhpXOVA4+n1H8="; - }) super.dependent-monoidal-map; - - # 2025-05-05: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/13 - dependent-sum-aeson-orphans = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/9b4698154303a9865d7d68a2f01d280a8a39f108.patch"; - hash = "sha256-Pzjl2yp01XsYWcyhpLnsuccg7bOACgv+RpafauUox8c="; - }) super.dependent-sum-aeson-orphans; - # https://github.com/obsidiansystems/dependent-sum/pull/73 dependent-sum-template = appendPatch (fetchpatch { url = "https://github.com/obsidiansystems/dependent-sum/commit/619727ba1792e39a68d23c62e75a923672e87a54.patch"; @@ -2666,12 +2607,6 @@ self: super: { relative = "dependent-sum-template"; }) super.dependent-sum-template; - aeson-gadt-th = appendPatch (fetchpatch { - url = "https://github.com/obsidiansystems/aeson-gadt-th/commit/8f6922a6440019dece637d73d70766c473bcd6c0.patch"; - hash = "sha256-564DhfiubwNV8nAj8L5DzsWn4MdzqqaYYNmOSPUa7ys="; - excludes = [ ".github/**" ]; - }) super.aeson-gadt-th; - # Too strict bounds on chell: https://github.com/fpco/haskell-filesystem/issues/24 system-fileio = doJailbreak super.system-fileio; @@ -2860,6 +2795,21 @@ self: super: { # base <4.14 decimal-literals = doJailbreak super.decimal-literals; + # 2024-06-22: hevm ghc96 fixes + hevm = lib.pipe super.hevm [ + (appendPatch (fetchpatch { + url = "https://github.com/ethereum/hevm/compare/02c072f...hellwolf:hevm:c29d3a7.patch"; + hash = "sha256-cL26HD77vXsiKqo5G6PXgK0q19MUGMwaNium5x93CBI="; + })) + (overrideCabal (old: { + postPatch = old.postPatch or "" + '' + sed -i 's/^ *brick .*,/brick,/' hevm.cabal + sed -i 's/^ *vty .*,/vty,/' hevm.cabal + ''; + })) + doJailbreak + ]; + # multiple bounds too strict snaplet-sqlite-simple = doJailbreak super.snaplet-sqlite-simple; @@ -2958,20 +2908,6 @@ self: super: { # 2023-03-05: restrictive bounds on base https://github.com/diagrams/diagrams-gtk/issues/11 diagrams-gtk = doJailbreak super.diagrams-gtk; - tomland = overrideCabal (drv: { - # 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2). - # Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd - jailbreak = true; - # Fix compilation of test suite with GHC >= 9.8 - patches = drv.patches or [ ] ++ [ - (pkgs.fetchpatch { - name = "tomland-disambiguate-string-type-for-ghc-9.8.patch"; - url = "https://github.com/kowainik/tomland/commit/0f107269b8835a8253f618b75930b11d3a3f1337.patch"; - sha256 = "13ndlfw32xh8jz5g6lpxzn2ks8zchb3y4j1jbbm2x279pdyvvars"; - }) - ]; - }) super.tomland; - # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; @@ -3024,7 +2960,7 @@ self: super: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.git]; }) super.kmonad; - ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { + ghc-syntax-highlighter_0_0_12_0 = super.ghc-syntax-highlighter_0_0_12_0.overrideScope(self: super: { ghc-lib-parser = self.ghc-lib-parser_9_10_1_20240511; }); @@ -3126,10 +3062,14 @@ self: super: { cornelis = dontCheck super.cornelis; cabal-gild = super.cabal-gild.overrideScope (self: super: { - tasty = super.tasty_1_5; - tasty-quickcheck = super.tasty-quickcheck_0_10_3; + tasty = super.tasty_1_5_1; + tasty-quickcheck = super.tasty-quickcheck_0_11; }); + lzma = doJailbreak (super.lzma.overrideScope (self: super: { + tasty = super.tasty_1_5_1; + })); + # Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18 commutative-semigroups = appendPatch (fetchpatch { url = "https://github.com/obsidiansystems/commutative-semigroups/commit/e031495dd24ae73ffb808eca34e993f5df8e8d76.patch"; @@ -3139,10 +3079,10 @@ self: super: { # Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged currencies = doJailbreak super.currencies; - # https://github.com/awakesecurity/proto3-wire/pull/104 - proto3-wire = appendPatch (pkgs.fetchpatch { - url = "https://github.com/awakesecurity/proto3-wire/commit/c1cadeb5fca2e82c5b28e2811c01f5b37eb21ed8.patch"; - hash = "sha256-tFOWpjGmZANC7H82QapZ36raaNWuZ6F3BgjxnfTXpMs="; - }) super.proto3-wire; + argon2 = appendPatch (fetchpatch { + # https://github.com/haskell-hvr/argon2/pull/20 + url = "https://github.com/haskell-hvr/argon2/commit/f7cc92f18e233e6b1dabf1798dd099e17b6a81a1.patch"; + hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0="; + }) (doJailbreak super.argon2); # Unmaintained } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index bcafc8c3fb78b..516c3caaa08fa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -101,9 +101,6 @@ self: super: { # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0; - # Tests depend on `parseTime` which is no longer available - hourglass = dontCheck super.hourglass; - # Needs to match ghc version ghc-tags = doDistribute self.ghc-tags_1_5; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 94cf15df5dff6..9969456cee09d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -78,9 +78,6 @@ in { ] ++ drv.testFlags or []; }) (doJailbreak super.hpack); - # Tests depend on `parseTime` which is no longer available - hourglass = dontCheck super.hourglass; - # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 4edc24f10add2..df467151596a7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -89,25 +89,6 @@ self: super: { # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; - # - # Too strict bounds, waiting on Hackage release in nixpkgs - # - - # - # Compilation failure workarounds - # - - # Add support for time 1.10 - # https://github.com/vincenthz/hs-hourglass/pull/56 - hourglass = appendPatches [ - (pkgs.fetchpatch { - name = "hourglass-pr-56.patch"; - url = - "https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch"; - sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q="; - }) - ] (super.hourglass); - # Jailbreaks for servant <0.20 servant-lucid = doJailbreak super.servant-lucid; @@ -163,15 +144,6 @@ self: super: { }) super.ascii-numbers; - # Fix ghc-9.6.x build errors. - libmpd = appendPatch - # https://github.com/vimus/libmpd-haskell/pull/138 - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; - name = "vimus-libmpd-haskell-pull-138.patch"; - sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; - }) - super.libmpd; - # Apply patch from PR with mtl-2.3 fix. ConfigFile = overrideCabal (drv: { editedCabalFile = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index c8750bc22631d..73661b29bef99 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -57,18 +57,21 @@ self: super: { ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; megaparsec = doDistribute self.megaparsec_9_6_1; - # TODO: remove when aeson updates or launches a revision - # see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088 - aeson = doJailbreak (doDistribute self.aeson_2_2_2_0); + # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable + # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f + aeson = doJailbreak (doDistribute self.aeson_2_2_3_0); attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; - ormolu = self.ormolu_0_7_4_0; - fourmolu = self.fourmolu_0_15_0_0; + ormolu = self.ormolu_0_7_7_0; + fourmolu = self.fourmolu_0_16_2_0; stylish-haskell = self.stylish-haskell_0_14_6_0; hlint = self.hlint_3_8; ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; websockets = self.websockets_0_13_0_0; + th-desugar = doJailbreak self.th-desugar_1_16; # th-abstraction >=0.6 && <0.7 + singletons-th = self.singletons-th_3_3; + singletons-base = self.singletons-base_3_3; # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = self.ghc-exactprint_1_8_0_0; @@ -119,7 +122,6 @@ self: super: { # unordered-containers = dontCheck super.unordered-containers; # ChasingBottoms doesn't support base 4.20 lifted-base = dontCheck super.lifted-base; # doesn't compile with transformers == 0.6.* - hourglass = dontCheck super.hourglass; # umaintained, test suite doesn't compile anymore bsb-http-chunked = dontCheck super.bsb-http-chunked; # umaintained, test suite doesn't compile anymore pcre-heavy = dontCheck super.pcre-heavy; # GHC warnings cause the tests to fail diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ebc065df7ef47..854246133ddbb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -224,7 +224,6 @@ broken-packages: - archnews # failure in job https://hydra.nixos.org/build/233192480 at 2023-09-02 - arena # failure in job https://hydra.nixos.org/build/233252500 at 2023-09-02 - argo # failure in job https://hydra.nixos.org/build/233216252 at 2023-09-02 - - argon2 # failure in job https://hydra.nixos.org/build/233207704 at 2023-09-02 - argparser # failure in job https://hydra.nixos.org/build/233222416 at 2023-09-02 - arguedit # failure in job https://hydra.nixos.org/build/233211367 at 2023-09-02 - arion # failure in job https://hydra.nixos.org/build/233254120 at 2023-09-02 @@ -2503,7 +2502,6 @@ broken-packages: - heterogeneous-list-literals # failure in job https://hydra.nixos.org/build/233212297 at 2023-09-02 - hetris # failure in job https://hydra.nixos.org/build/233256814 at 2023-09-02 - heukarya # failure in job https://hydra.nixos.org/build/233247440 at 2023-09-02 - - hevm # failure in job https://hydra.nixos.org/build/254311642 at 2024-03-31 - HExcel # failure in job https://hydra.nixos.org/build/233211971 at 2023-09-02 - hexchat # failure in job https://hydra.nixos.org/build/233234161 at 2023-09-02 - hexif # failure in job https://hydra.nixos.org/build/233245470 at 2023-09-02 @@ -3601,7 +3599,6 @@ broken-packages: - L-seed # failure in job https://hydra.nixos.org/build/233222324 at 2023-09-02 - lsfrom # failure in job https://hydra.nixos.org/build/233211705 at 2023-09-02 - lsh # failure in job https://hydra.nixos.org/build/233256686 at 2023-09-02 - - lsp-client # failure in job https://hydra.nixos.org/build/233219871 at 2023-09-02 - ltext # failure in job https://hydra.nixos.org/build/255686825 at 2024-04-16 - lti13 # failure in job https://hydra.nixos.org/build/252715722 at 2024-03-16 - ltiv1p1 # failure in job https://hydra.nixos.org/build/233200883 at 2023-09-02 @@ -5442,7 +5439,6 @@ broken-packages: - simplistic-generics # failure in job https://hydra.nixos.org/build/233217412 at 2023-09-02 - singlethongs # failure in job https://hydra.nixos.org/build/233202756 at 2023-09-02 - singleton-dict # failure in job https://hydra.nixos.org/build/233245405 at 2023-09-02 - - singletons-base # failure in job https://hydra.nixos.org/build/252714303 at 2024-03-16 - singleton-typelits # failure in job https://hydra.nixos.org/build/233250877 at 2023-09-02 - single-tuple # failure in job https://hydra.nixos.org/build/233204418 at 2023-09-02 - singnal # failure in job https://hydra.nixos.org/build/233214111 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bc102cb88861d..56d1e5aae599d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -99,7 +99,6 @@ extra-packages: - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - - fourmolu == 0.11.* # 2023-10-22: for hls on ghc 9.0 - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat @@ -126,6 +125,9 @@ extra-packages: - ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci - versions < 6 # 2024-04-22: required by spago-0.21 - fsnotify < 0.4 # 2024-04-22: required by spago-0.21 + - th-desugar == 1.16 # 2024-06-28: preserve for GHC 9.8 + - singletons-th == 3.3 # 2024-06-28: preserve for GHC 9.8 + - singletons-base == 3.3 # 2024-06-28: preserve for GHC 9.8 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index c1d2610360c22..25a4601281343 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.22 +# Stackage LTS 22.26 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -361,6 +361,7 @@ default-package-overrides: - appendful ==0.1.0.0 - appendful-persistent ==0.1.0.1 - appendmap ==0.1.5 + - apply-merge ==0.1.1.0 - apply-refact ==0.13.0.0 - apportionment ==0.0.0.4 - approximate ==0.3.5 @@ -402,8 +403,8 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-data ==1.0.5.4 - attoparsec-expr ==0.1.1.2 - - attoparsec-framer ==0.1.0.3 - - attoparsec-iso8601 ==1.1.0.1 + - attoparsec-framer ==0.1.0.4 + - attoparsec-iso8601 ==1.1.1.0 - attoparsec-path ==0.0.0.1 - attoparsec-run ==0.0.2.0 - attoparsec-time ==1.0.3.1 @@ -415,7 +416,7 @@ default-package-overrides: - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.3 - autodocodec-yaml ==0.2.0.3 - - autoexporter ==2.0.0.9 + - autoexporter ==2.0.0.12 - auto-update ==0.1.6 - avro ==0.6.1.2 - aws ==0.24.1 @@ -453,8 +454,8 @@ default-package-overrides: - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - beam-core ==0.10.1.0 - - bech32 ==1.1.6 - - bech32-th ==1.1.6 + - bech32 ==1.1.7 + - bech32-th ==1.1.7 - benchpress ==0.2.2.23 - bencode ==0.6.1.1 - benri-hspec ==0.1.0.2 @@ -472,7 +473,7 @@ default-package-overrides: - binary-ieee754 ==0.1.0.0 - binary-instances ==1.0.4 - binary-list ==1.1.1.2 - - binary-orphans ==1.0.4.1 + - binary-orphans ==1.0.5 - binary-parser ==0.5.7.6 - binary-search ==2.0.0 - binary-shared ==0.8.3 @@ -490,7 +491,7 @@ default-package-overrides: - bitwise ==1.0.0.1 - bitwise-enum ==1.0.1.2 - blake2 ==0.3.0.1 - - Blammo ==1.1.2.3 + - Blammo ==1.1.3.0 - blank-canvas ==0.7.4 - blanks ==0.5.0 - blas-carray ==0.1.0.2 @@ -507,7 +508,7 @@ default-package-overrides: - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 - bm ==0.2.0.0 - - bmp ==1.2.6.3 + - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 - BNFC ==2.9.5 - BNFC-meta ==0.6.1 @@ -516,10 +517,10 @@ default-package-overrides: - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolsimplifier ==0.1.8 - - boomerang ==1.4.9.2 + - boomerang ==1.4.9.3 - boomwhacker ==0.0.1 - bordacount ==0.1.0.0 - - boring ==0.2.1 + - boring ==0.2.2 - bound ==2.0.7 - BoundedChan ==1.0.3.0 - bounded-qsem ==0.1.0.2 @@ -527,7 +528,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - box ==0.9.3.1 - boxes ==0.1.5 - - breakpoint ==0.1.3.1 + - breakpoint ==0.1.4.0 - brick ==2.1.1 - broadcast-chan ==0.2.1.2 - brotli ==0.0.0.1 @@ -544,7 +545,7 @@ default-package-overrides: - bugsnag-wai ==1.0.0.1 - bugsnag-yesod ==1.0.1.0 - bugzilla-redhat ==1.0.1.1 - - burrito ==2.0.1.9 + - burrito ==2.0.1.10 - bv ==0.5 - bv-little ==1.3.2 - bv-sized ==1.0.5 @@ -631,7 +632,7 @@ default-package-overrides: - checkers ==0.6.0 - checksum ==0.0.0.1 - chimera ==0.3.4.0 - - choice ==0.2.3 + - choice ==0.2.4.1 - chronologique ==0.3.1.3 - chronos ==1.1.6.1 - chronos-bench ==0.2.0.2 @@ -666,8 +667,8 @@ default-package-overrides: - collect-errors ==0.1.6.0 - co-log ==0.6.1.0 - co-log-concurrent ==0.5.1.0 - - co-log-core ==0.3.2.1 - - co-log-polysemy ==0.0.1.4 + - co-log-core ==0.3.2.2 + - co-log-polysemy ==0.0.1.5 - colonnade ==1.2.0.2 - Color ==0.3.3 - colorful-monoids ==0.2.1.3 @@ -676,9 +677,9 @@ default-package-overrides: - colourista ==0.1.0.2 - columnar ==1.0.0.0 - combinatorial ==0.1.1 - - comfort-array ==0.5.4.2 + - comfort-array ==0.5.5 - comfort-array-shape ==0.0 - - comfort-blas ==0.0.2 + - comfort-blas ==0.0.3 - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 @@ -729,7 +730,7 @@ default-package-overrides: - configurator-pg ==0.2.10 - config-value ==0.8.3 - constraints ==0.14.2 - - constraints-extras ==0.4.0.0 + - constraints-extras ==0.4.0.1 - constraint-tuples ==0.1.2 - construct ==0.3.1.2 - context ==0.2.1.0 @@ -759,7 +760,7 @@ default-package-overrides: - core-telemetry ==0.2.9.4 - core-text ==0.3.8.1 - countable ==1.2 - - country ==0.2.4.1 + - country ==0.2.4.2 - covariance ==0.2.0.1 - cpphs ==1.20.9.1 - cpu ==0.1.2 @@ -788,7 +789,7 @@ default-package-overrides: - cryptonite ==0.30 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypton-x509 ==1.7.6 + - crypton-x509 ==1.7.7 - crypton-x509-store ==1.6.9 - crypton-x509-system ==1.6.7 - crypton-x509-validation ==1.6.12 @@ -797,7 +798,7 @@ default-package-overrides: - cryptostore ==0.3.1.0 - crypt-sha512 ==0 - csp ==1.4.0 - - css-syntax ==0.1.0.1 + - css-syntax ==0.1.0.2 - css-text ==0.1.3.0 - c-struct ==0.1.3.0 - csv ==0.1.2 @@ -865,7 +866,7 @@ default-package-overrides: - debian ==4.0.5 - debian-build ==0.10.2.1 - debug-trace-var ==0.2.0 - - dec ==0.0.5 + - dec ==0.0.6 - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 @@ -977,9 +978,9 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - effectful ==2.3.0.0 - - effectful-core ==2.3.0.1 - - effectful-plugin ==1.1.0.2 + - effectful ==2.3.1.0 + - effectful-core ==2.3.1.0 + - effectful-plugin ==1.1.0.3 - effectful-th ==1.0.0.1 - egison-pattern-src ==0.2.1.2 - either ==5.0.2 @@ -991,7 +992,7 @@ default-package-overrides: - elm-bridge ==0.8.3 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm-street ==0.2.2.0 + - elm-street ==0.2.2.1 - elynx ==0.7.2.2 - elynx-markov ==0.7.2.2 - elynx-nexus ==0.7.2.2 @@ -1014,7 +1015,7 @@ default-package-overrides: - epub-metadata ==5.2 - eq ==4.3 - equal-files ==0.0.5.4 - - equational-reasoning ==0.7.0.2 + - equational-reasoning ==0.7.0.3 - equivalence ==0.4.1 - erf ==2.0.0.0 - errata ==0.4.0.2 @@ -1061,10 +1062,11 @@ default-package-overrides: - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.1.2.7 + - faktory ==1.1.3.0 + - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.2 + - fast-logger ==3.2.3 - fast-math ==1.0.2 - fast-myers-diff ==0.0.0 - fb ==2.1.1.1 @@ -1113,7 +1115,7 @@ default-package-overrides: - flexible-defaults ==0.0.3 - FloatingHex ==0.5 - floatshow ==0.2.4 - - flow ==2.0.0.4 + - flow ==2.0.0.5 - flush-queue ==1.0.0 - fmlist ==0.9.4 - fmt ==0.6.3.0 @@ -1234,12 +1236,12 @@ default-package-overrides: - ghc-parser ==0.2.6.0 - ghc-paths ==0.1.0.12 - ghc-syntax-highlighter ==0.0.10.0 - - ghc-tcplugins-extra ==0.4.5 - - ghc-trace-events ==0.1.2.8 - - ghc-typelits-extra ==0.4.6 - - ghc-typelits-knownnat ==0.7.10 - - ghc-typelits-natnormalise ==0.7.9 - - ghc-typelits-presburger ==0.7.3.0 + - ghc-tcplugins-extra ==0.4.6 + - ghc-trace-events ==0.1.2.9 + - ghc-typelits-extra ==0.4.7 + - ghc-typelits-knownnat ==0.7.12 + - ghc-typelits-natnormalise ==0.7.10 + - ghc-typelits-presburger ==0.7.4.0 - ghost-buster ==0.1.1.0 - ghostscript-parallel ==0.0.1 - gi-atk ==2.0.27 @@ -1267,7 +1269,7 @@ default-package-overrides: - gi-soup ==2.4.28 - githash ==0.1.7.0 - github ==0.29 - - github-release ==2.0.0.10 + - github-release ==2.0.0.11 - github-rest ==1.1.4 - github-types ==0.2.1 - github-webhooks ==0.17.0 @@ -1321,7 +1323,7 @@ default-package-overrides: - hackage-security ==0.6.2.4 - haddock-library ==1.11.0 - haha ==0.3.1.1 - - hakyll ==4.16.2.0 + - hakyll ==4.16.2.1 - hakyllbars ==1.0.1.0 - hal ==1.0.1 - half ==0.3.1 @@ -1341,8 +1343,8 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.8 - - haskell-gi-base ==0.26.4 + - haskell-gi ==0.26.9 + - haskell-gi-base ==0.26.5 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 - HaskellNet ==0.6.1.2 @@ -1350,7 +1352,7 @@ default-package-overrides: - haskell-src-exts ==1.23.1 - haskell-src-exts-simple ==1.23.0.0 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.13 + - haskell-src-meta ==0.8.14 - haskintex ==0.8.0.2 - haskoin-core ==1.0.4 - haskoin-node ==1.0.1 @@ -1411,7 +1413,7 @@ default-package-overrides: - histogram-fill ==0.9.1.0 - hjsmin ==0.2.1 - hkd-default ==1.1.0.0 - - hkgr ==0.4.4 + - hkgr ==0.4.5 - hledger ==1.32.3 - hledger-iadd ==1.3.20 - hledger-interest ==1.6.6 @@ -1476,9 +1478,9 @@ default-package-overrides: - hslua-core ==2.3.2 - hslua-list ==1.1.1 - hslua-marshalling ==2.3.1 - - hslua-module-doclayout ==1.1.1 + - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 - - hslua-module-system ==1.1.1 + - hslua-module-system ==1.1.2 - hslua-module-text ==1.1.1 - hslua-module-version ==1.1.1 - hslua-module-zip ==1.1.3 @@ -1488,15 +1490,15 @@ default-package-overrides: - hslua-typing ==0.1.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.7.6 + - HsOpenSSL ==0.11.7.7 - HsOpenSSL-x509-system ==0.1.0.4 - - hspec ==2.11.8 - - hspec-api ==2.11.8 + - hspec ==2.11.9 + - hspec-api ==2.11.9 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - hspec-contrib ==0.5.2 - - hspec-core ==2.11.8 - - hspec-discover ==2.11.8 + - hspec-core ==2.11.9 + - hspec-discover ==2.11.9 - hspec-expectations ==0.8.4 - hspec-expectations-json ==1.0.2.1 - hspec-expectations-lifted ==0.10.0 @@ -1504,10 +1506,10 @@ default-package-overrides: - hspec-golden ==0.2.2.0 - hspec-golden-aeson ==0.9.0.0 - hspec-hedgehog ==0.1.1.0 - - hspec-junit-formatter ==1.1.0.2 + - hspec-junit-formatter ==1.1.2.0 - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.1 - - hspec-meta ==2.11.8 + - hspec-meta ==2.11.9 - hspec-parsec ==0 - hspec-smallcheck ==0.5.3 - hspec-tmp-proc ==0.5.2.0 @@ -1548,7 +1550,7 @@ default-package-overrides: - http-link-header ==1.2.1 - http-media ==0.8.1.1 - http-query ==0.1.3 - - http-reverse-proxy ==0.6.0.2 + - http-reverse-proxy ==0.6.0.3 - http-streams ==0.8.9.9 - http-types ==0.12.4 - human-readable-duration ==0.2.1.4 @@ -1611,8 +1613,8 @@ default-package-overrides: - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1.1.1 - - indexed-traversable ==0.1.3 - - indexed-traversable-instances ==0.1.1.2 + - indexed-traversable ==0.1.4 + - indexed-traversable-instances ==0.1.2 - inf-backprop ==0.1.0.2 - infer-license ==0.2.0 - infinite-list ==0.1.1 @@ -1679,18 +1681,18 @@ default-package-overrides: - jose ==0.11 - jose-jwt ==0.9.6 - journalctl-stream ==0.6.0.6 - - jsaddle ==0.9.9.0 + - jsaddle ==0.9.9.2 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.11 - - json-feed ==2.0.0.11 + - json-feed ==2.0.0.12 - jsonifier ==0.2.1.3 - jsonpath ==0.3.0.0 - json-rpc ==1.0.4 - json-stream ==0.4.5.3 - - JuicyPixels ==3.3.8 + - JuicyPixels ==3.3.9 - JuicyPixels-extra ==0.6.0 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.3 @@ -1700,7 +1702,7 @@ default-package-overrides: - kansas-comet ==0.4.2 - katip ==0.8.8.0 - katip-logstash ==0.1.0.2 - - katip-wai ==0.1.2.3 + - katip-wai ==0.1.2.4 - kazura-queue ==0.1.0.4 - kdt ==0.2.5 - keep-alive ==0.2.1.0 @@ -1723,7 +1725,7 @@ default-package-overrides: - koji-tool ==1.1.1 - kvitable ==1.0.3.0 - labels ==0.3.3 - - lackey ==2.0.0.7 + - lackey ==2.0.0.8 - lambdabot-core ==5.3.1.2 - lambdabot-irc-plugins ==5.3.1.2 - LambdaHack ==0.11.0.1 @@ -1742,7 +1744,7 @@ default-package-overrides: - language-lua ==0.11.0.2 - language-protobuf ==1.0.1 - language-python ==0.5.8 - - lapack ==0.5.1.1 + - lapack ==0.5.2 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 @@ -1750,7 +1752,7 @@ default-package-overrides: - lapack-hmatrix ==0.0.0.2 - largeword ==1.2.5 - latex ==0.1.0.4 - - lattices ==2.2 + - lattices ==2.2.1 - lawful ==0.1.0.0 - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 @@ -1774,7 +1776,7 @@ default-package-overrides: - LetsBeRational ==1.0.0.0 - leveldb-haskell ==0.6.5 - lexer-applicative ==2.1.0.2 - - libBF ==0.6.7 + - libBF ==0.6.8 - libffi ==0.2.1 - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 @@ -1797,9 +1799,9 @@ default-package-overrides: - ListLike ==4.7.8.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-shuffle ==1.0.0 + - list-shuffle ==1.0.0.1 - list-t ==1.0.5.7 - - list-transformer ==1.1.0 + - list-transformer ==1.1.1 - ListTree ==0.2.3 - ListZipper ==1.2.0.2 - literatex ==0.3.0.0 @@ -1835,7 +1837,7 @@ default-package-overrides: - lumberjack ==1.0.3.0 - lz4 ==0.2.3.1 - lz4-frame-conduit ==0.1.0.1 - - lzma ==0.0.1.0 + - lzma ==0.0.1.1 - lzma-clib ==5.2.2 - machines ==0.7.3 - magic ==1.1 @@ -1845,7 +1847,7 @@ default-package-overrides: - main-tester ==0.2.0.1 - managed ==1.0.10 - mandrill ==0.5.7.0 - - mappings ==0.3.0.0 + - mappings ==0.3.1.0 - map-syntax ==0.3 - markdown ==0.1.17.5 - markdown-unlit ==0.6.0 @@ -1913,7 +1915,7 @@ default-package-overrides: - minimal-configuration ==0.1.4 - minimorph ==0.3.0.1 - minisat-solver ==0.1 - - miniterion ==0.1.1.0 + - miniterion ==0.1.1.1 - miniutter ==0.5.1.2 - min-max-pqueue ==0.1.0.2 - mintty ==0.1.4 @@ -1936,7 +1938,7 @@ default-package-overrides: - moffy ==0.1.1.0 - moffy-samples ==0.1.0.3 - moffy-samples-events ==0.2.2.5 - - monad-chronicle ==1.0.1 + - monad-chronicle ==1.0.2 - monad-control ==1.0.3.1 - monad-control-aligned ==0.0.2.1 - monad-control-identity ==0.2.0.0 @@ -1965,10 +1967,10 @@ default-package-overrides: - monads-tf ==0.3.0.1 - monad-time ==0.4.0.0 - mongoDB ==2.7.1.4 - - monoidal-containers ==0.6.4.0 + - monoidal-containers ==0.6.5.0 - monoidal-functors ==0.2.3.0 - monoid-extras ==0.6.2 - - monoid-subclasses ==1.2.5 + - monoid-subclasses ==1.2.5.1 - monoid-transformer ==0.0.4 - monomer ==1.6.0.1 - mono-traversable ==1.0.17.0 @@ -2029,7 +2031,7 @@ default-package-overrides: - netcode-io ==0.0.3 - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 - - netlib-ffi ==0.1.1 + - netlib-ffi ==0.1.2 - net-mqtt ==0.8.6.0 - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 @@ -2064,6 +2066,7 @@ default-package-overrides: - non-empty ==0.3.5 - nonempty-containers ==0.3.4.5 - non-empty-sequence ==0.2.0.4 + - non-empty-text ==0.2.1 - nonempty-vector ==0.2.3 - nonempty-zipper ==1.0.0.4 - non-negative ==0.1.2 @@ -2104,7 +2107,7 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - oops ==0.2.0.1 - - opaleye ==0.10.3.0 + - opaleye ==0.10.3.1 - OpenAL ==1.7.0.5 - openapi3 ==3.2.4 - open-browser ==0.2.1.0 @@ -2136,9 +2139,9 @@ default-package-overrides: - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 - - ordered-containers ==0.2.3 + - ordered-containers ==0.2.4 - ormolu ==0.7.2.0 - - os-string ==2.0.2.2 + - os-string ==2.0.3 - overhang ==1.0.0 - packcheck ==0.6.0 - pager ==0.1.1.0 @@ -2184,13 +2187,13 @@ default-package-overrides: - path-dhall-instance ==0.2.1.0 - path-extensions ==0.1.1.0 - path-extra ==0.3.1 - - path-io ==1.8.1 + - path-io ==1.8.2 - path-like ==0.2.0.2 - path-pieces ==0.2.1 - pathtype ==0.8.1.3 - path-utils ==0.1.1.0 - pathwalk ==0.3.1.2 - - patrol ==1.0.0.7 + - patrol ==1.0.0.8 - pava ==0.1.1.4 - pcf-font ==0.2.2.1 - pcg-random ==0.1.4.0 @@ -2199,9 +2202,9 @@ default-package-overrides: - pcre-light ==0.4.1.2 - pcre-utils ==0.1.9 - pdc ==0.1.1 - - pdf-toolbox-content ==0.1.1 - - pdf-toolbox-core ==0.1.1 - - pdf-toolbox-document ==0.1.2 + - pdf-toolbox-content ==0.1.2 + - pdf-toolbox-core ==0.1.3 + - pdf-toolbox-document ==0.1.4 - peano ==0.1.0.2 - pedersen-commitment ==0.2.0 - pem ==0.2.4 @@ -2264,7 +2267,7 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.9.1.3 + - polysemy ==1.9.2.0 - polysemy-fs ==0.1.0.0 - polysemy-plugin ==0.4.5.2 - polysemy-webserver ==0.2.1.2 @@ -2354,7 +2357,7 @@ default-package-overrides: - pusher-http-haskell ==2.1.0.17 - pvar ==1.0.0.0 - pwstore-fast ==2.4.4 - - PyF ==0.11.2.1 + - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - qrcode-core ==0.9.9 @@ -2367,11 +2370,11 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - - quickcheck-groups ==0.0.1.2 + - quickcheck-groups ==0.0.1.3 - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.30 - quickcheck-io ==0.2.0 - - quickcheck-monoid-subclasses ==0.3.0.3 + - quickcheck-monoid-subclasses ==0.3.0.4 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-state-machine ==0.8.0 @@ -2385,7 +2388,7 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2.1 - - rampart ==2.0.0.7 + - rampart ==2.0.0.8 - ramus ==0.1.2 - rando ==0.0.0.4 - random ==1.2.1.2 @@ -2399,12 +2402,12 @@ default-package-overrides: - ranges ==0.2.4 - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - - rank2classes ==1.5.3 + - rank2classes ==1.5.3.1 - Rasterific ==0.7.5.4 - rasterific-svg ==0.3.3.2 - - ratel ==2.0.0.11 + - ratel ==2.0.0.12 - rate-limit ==1.4.3 - - ratel-wai ==2.0.0.6 + - ratel-wai ==2.0.0.7 - ratio-int ==0.1.2 - rattle ==0.2 - rattletrap ==12.1.3 @@ -2428,7 +2431,7 @@ default-package-overrides: - rec-def ==0.2.2 - record-hasfield ==1.0.1 - records-sop ==0.1.1.1 - - recursion-schemes ==5.2.2.5 + - recursion-schemes ==5.2.3 - recv ==0.1.0 - redact ==0.5.0.0 - reddit-scrape ==0.0.1 @@ -2480,12 +2483,12 @@ default-package-overrides: - rfc5051 ==0.2 - rg ==1.4.0.0 - riak-protobuf ==0.25.0.0 - - richenv ==0.1.0.1 + - richenv ==0.1.0.2 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.8.0 - rng-utils ==0.3.1 - - roc-id ==0.2.0.2 + - roc-id ==0.2.0.3 - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.6 - rocksdb-query ==0.4.2 @@ -2524,7 +2527,7 @@ default-package-overrides: - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - saltine ==0.2.1.0 - - salve ==2.0.0.4 + - salve ==2.0.0.5 - sample-frame ==0.0.4 - sample-frame-np ==0.0.5 - sampling ==0.3.5 @@ -2558,13 +2561,13 @@ default-package-overrides: - securemem ==0.1.10 - selections ==0.3.0.0 - selective ==0.7.0.1 - - semialign ==1.3 + - semialign ==1.3.1 - semigroupoids ==6.0.1 - semigroups ==0.20 - semirings ==0.6 - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - - sendfile ==0.7.11.5 + - sendfile ==0.7.11.6 - sendgrid-v3 ==1.0.0.1 - seqalign ==0.2.0.4 - seqid ==0.6.3 @@ -2651,23 +2654,23 @@ default-package-overrides: - simple-media-timestamp ==0.2.1.0 - simple-media-timestamp-attoparsec ==0.1.0.0 - simple-pango ==0.1.0.1 - - simple-prompt ==0.2.2 + - simple-prompt ==0.2.3 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.32 - simple-session ==2.0.0 - simple-templates ==2.0.0 - simple-vec3 ==0.6.0.1 - since ==0.0.0 - - singleton-bool ==0.1.7 + - singleton-bool ==0.1.8 - singleton-nats ==0.4.7 - singletons ==3.0.3 - singletons-base ==3.2 - - singletons-presburger ==0.7.3.0 + - singletons-presburger ==0.7.4.0 - singletons-th ==3.2 - Sit ==0.2023.8.3 - sitemap-gen ==0.1.0.0 - size-based ==0.1.3.2 - - sized ==1.1.0.1 + - sized ==1.1.0.2 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 @@ -2767,8 +2770,8 @@ default-package-overrides: - strict-base-types ==0.8 - strict-concurrency ==0.2.4.3 - strict-lens ==0.4.0.3 - - strict-list ==0.1.7.4 - - strict-tuple ==0.1.5.3 + - strict-list ==0.1.7.5 + - strict-tuple ==0.1.5.4 - strict-wrapper ==0.0.1.0 - stringable ==0.1.3 - stringbuilder ==0.5.1 @@ -2785,11 +2788,11 @@ default-package-overrides: - stripe-concepts ==1.0.3.3 - stripe-signature ==1.0.0.16 - stripe-wreq ==1.0.1.16 - - strive ==6.0.0.11 + - strive ==6.0.0.12 - structs ==0.1.9 - structured ==0.1.1 - stylish-haskell ==0.14.5.0 - - subcategories ==0.2.1.0 + - subcategories ==0.2.1.1 - sundown ==0.6 - superbuffer ==0.3.1.2 - svg-builder ==0.1.1 @@ -2847,7 +2850,7 @@ default-package-overrides: - tar-conduit ==0.4.1 - tasty ==1.4.3 - tasty-ant-xml ==1.1.9 - - tasty-autocollect ==0.4.2 + - tasty-autocollect ==0.4.3 - tasty-bench ==0.3.5 - tasty-bench-fit ==0.1 - tasty-checklist ==1.0.6.0 @@ -2913,7 +2916,7 @@ default-package-overrides: - text-conversions ==0.3.1.1 - text-format ==0.3.2.1 - text-icu ==0.8.0.5 - - text-iso8601 ==0.1 + - text-iso8601 ==0.1.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 @@ -2936,9 +2939,9 @@ default-package-overrides: - th-data-compat ==0.1.3.1 - th-desugar ==1.15 - th-env ==0.1.1 - - these ==1.2 - - these-lens ==1.0.1.3 - - these-optics ==1.0.1.2 + - these ==1.2.1 + - these-lens ==1.0.2 + - these-optics ==1.0.2 - these-skinny ==0.7.6 - th-expand-syns ==0.4.11.0 - th-extras ==0.0.0.8 @@ -2974,7 +2977,7 @@ default-package-overrides: - time-parsers ==0.2 - timerep ==2.1.0.0 - timers-tick ==0.5.0.4 - - timer-wheel ==1.0.0 + - timer-wheel ==1.0.0.1 - timespan ==0.4.0.0 - time-units ==1.0.0 - time-units-types ==0.2.0.1 @@ -2996,8 +2999,8 @@ default-package-overrides: - toml-parser ==1.3.2.0 - toml-reader ==0.2.1.0 - toml-reader-parse ==0.1.1.1 - - tophat ==1.0.7.0 - - topograph ==1.0.0.2 + - tophat ==1.0.8.0 + - topograph ==1.0.1 - torrent ==10000.1.3 - torsor ==0.1.0.1 - tostring ==0.2.1.1 @@ -3091,7 +3094,7 @@ default-package-overrides: - universum ==1.8.2.1 - unix-bytestring ==0.4.0.1 - unix-compat ==0.7.1 - - unix-time ==0.4.12 + - unix-time ==0.4.15 - unjson ==0.15.4 - unliftio ==0.2.25.0 - unliftio-core ==0.2.1.0 @@ -3138,7 +3141,7 @@ default-package-overrides: - vcs-ignore ==0.0.2.0 - vec ==0.5 - vector ==0.13.1.0 - - vector-algorithms ==0.9.0.1 + - vector-algorithms ==0.9.0.2 - vector-binary-instances ==0.2.5.2 - vector-buffer ==0.4.1 - vector-builder ==0.3.8.5 @@ -3155,7 +3158,7 @@ default-package-overrides: - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - verset ==0.0.1.9 - - versions ==6.0.6 + - versions ==6.0.7 - vformat ==0.14.1.0 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 @@ -3176,7 +3179,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==1.0.0.0 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.14 + - wai-extra ==3.1.15 - wai-feature-flags ==0.1.0.8 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.4.0 @@ -3218,7 +3221,7 @@ default-package-overrides: - wide-word ==0.1.6.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.2.1.0 + - witch ==1.2.1.1 - withdependencies ==0.3.0 - witherable ==0.4.2 - within ==0.2.0.1 @@ -3241,7 +3244,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - ws ==0.0.6 - wss-client ==0.3.0.0 - - wuss ==2.0.1.8 + - wuss ==2.0.1.9 - X11 ==1.10.3 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 @@ -3276,7 +3279,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.8 + - Yampa ==0.14.9 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 02e2d5954d20f..578da2a5b2b3b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -611,7 +611,7 @@ dont-distribute-packages: - bamstats - barley - base32-bytestring - - base_4_20_0_0 + - base_4_20_0_1 - baserock-schema - basic - batchd @@ -632,7 +632,6 @@ dont-distribute-packages: - bearriver - beautifHOL - bech32-th - - bech32-th_1_1_7 - bein - belka - bff @@ -1176,6 +1175,7 @@ dont-distribute-packages: - distribution-plot - dixi - dl-fedora + - dl-fedora_1_1 - dmenu-pkill - dmenu-pmount - dmenu-search @@ -1469,7 +1469,6 @@ dont-distribute-packages: - funnyprint - funsat - fwgl-glfw - - fwgl-javascript - fxpak - g2 - g2q @@ -1964,7 +1963,7 @@ dont-distribute-packages: - haskoin-bitcoind - haskoin-crypto - haskoin-node - - haskoin-node_1_1_0 + - haskoin-node_1_1_3 - haskoin-protocol - haskoin-script - haskoon @@ -1985,6 +1984,7 @@ dont-distribute-packages: - haskus-web - haslo - hasloGUI + - hasmtlib - hasql-cursor-query - hasql-postgres - hasql-postgres-options @@ -2224,7 +2224,6 @@ dont-distribute-packages: - hsx-xhtml - hsyslog-tcp - html-kure - - html-parse-util - html2hamlet - htoml-parse - htsn-import @@ -2398,6 +2397,7 @@ dont-distribute-packages: - jespresso - jmacro-rpc-happstack - jmacro-rpc-snap + - job - jobs-ui - join - jordan-openapi @@ -2466,7 +2466,6 @@ dont-distribute-packages: - kevin - key-vault - keyring - - keysafe - keystore - keyvaluehash - keyword-args @@ -2486,7 +2485,6 @@ dont-distribute-packages: - kubernetes-client - kure-your-boilerplate - kurita - - kvitable - laborantin-hs - labsat - labyrinth @@ -2539,7 +2537,6 @@ dont-distribute-packages: - layouting - lazy-hash-cache - lda - - ldap-client - ldap-client-og - ldap-scim-bridge - ldapply @@ -3874,6 +3871,7 @@ dont-distribute-packages: - syslog - systemd-api - systemstats + - systranything - t3-client - ta - tag-stream @@ -3903,7 +3901,6 @@ dont-distribute-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens - - tasty-sugar - tateti-tateti - tbox - tccli diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 706bd2dfecf2b..6767fe1f34822 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -242,6 +242,19 @@ self: super: builtins.intersectAttrs super { cabal2nix = self.generateOptparseApplicativeCompletions [ "cabal2nix" ] super.cabal2nix; arbtt = overrideCabal (drv: { + buildTools = drv.buildTools or [] ++ [ + pkgs.buildPackages.installShellFiles + pkgs.buildPackages.libxslt + ]; + postBuild = '' + xsl=${pkgs.buildPackages.docbook_xsl}/share/xml/docbook-xsl + make -C doc man XSLTPROC_MAN_STYLESHEET=$xsl/manpages/profile-docbook.xsl + ''; + postInstall = '' + for f in doc/man/man[1-9]/*; do + installManPage $f + done + ''; # The test suite needs the packages's executables in $PATH to succeed. preCheck = '' for i in $PWD/dist/build/*; do @@ -443,7 +456,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... + adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); @@ -1202,12 +1215,10 @@ self: super: builtins.intersectAttrs super { { fourmolu = fourmoluTestFix super.fourmolu; - fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0; - fourmolu_0_15_0_0 = fourmoluTestFix super.fourmolu_0_15_0_0; + fourmolu_0_16_2_0 = fourmoluTestFix super.fourmolu_0_16_2_0; }) fourmolu - fourmolu_0_14_1_0 - fourmolu_0_15_0_0 + fourmolu_0_16_2_0 ; # Test suite needs to execute 'disco' binary diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2e81440fca778..97f4a2e3b5aaf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2109,8 +2109,8 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.1.2.3"; - sha256 = "1qiya1wd0crisjxcnjbxadkbb6ll3zzb102w4q82ga0mglxx5i4r"; + version = "1.1.3.0"; + sha256 = "1wwxiyshsx0lgb99vdliippszl2lrplwji4saavks2fgpqllgsly"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson @@ -2126,6 +2126,32 @@ self: { license = lib.licenses.mit; }) {}; + "Blammo_1_2_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock + , containers, dlist, envparse, exceptions, fast-logger, hspec + , http-types, lens, markdown-unlit, monad-logger-aeson, mtl, text + , time, unliftio, unliftio-core, unordered-containers, vector, wai + }: + mkDerivation { + pname = "Blammo"; + version = "1.2.1.0"; + sha256 = "1hirn71nqghv1y7p7217h7kjpv6p9hglhpsxp007vnnhas7my6il"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive clock containers dlist + envparse exceptions fast-logger http-types lens monad-logger-aeson + mtl text time unliftio unliftio-core unordered-containers vector + wai + ]; + testHaskellDepends = [ + aeson base bytestring envparse hspec lens markdown-unlit mtl text + time + ]; + testToolDepends = [ markdown-unlit ]; + description = "Batteries-included Structured Logging library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "BlastHTTP" = callPackage ({ mkDerivation, base, BiobaseBlast, BiobaseFasta, bytestring , conduit, either-unwrap, HTTP, http-conduit, hxt, mtl, network @@ -6387,8 +6413,8 @@ self: { }: mkDerivation { pname = "FiniteCategories"; - version = "0.6.5.0"; - sha256 = "00vdcd8lliwril814r9da57cdjfkq6fpa613j2kadhx9bic5rphs"; + version = "0.6.5.1"; + sha256 = "0wjq5z9rh7c1c08s0vqr45nkvqlimlllh5bdpqi6pajyf3x58504"; libraryHaskellDepends = [ base containers directory filepath random text WeakSets ]; @@ -7398,19 +7424,19 @@ self: { "Gamgine" = callPackage ({ mkDerivation, array, base, bytestring, composition, cpphs - , data-lens, directory, filepath, GLFW-b, ListZipper, mtl + , data-lens-light, directory, filepath, GLFW-b, ListZipper, mtl , OpenGLRaw, parsec, pretty-show, StateVar, time , unordered-containers, utility-ht, Vec, zlib }: mkDerivation { pname = "Gamgine"; - version = "0.6.0"; - sha256 = "171mfxq7s719j3h2nfsck2qmwrkmlp3731na6nd81b5x3jvl3ma0"; + version = "0.7.0"; + sha256 = "01vgfs8yqzplimczjyy2jahm8777vxm23s3qvfy4h6dd32nvp15a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring composition data-lens directory filepath - GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show StateVar time - unordered-containers utility-ht Vec zlib + array base bytestring composition data-lens-light directory + filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show + StateVar time unordered-containers utility-ht Vec zlib ]; libraryToolDepends = [ cpphs ]; description = "Some kind of game library or set of utilities"; @@ -11451,10 +11477,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.7.6"; - sha256 = "18n7yhffqhgl2favmwlky9j0xx61bhs1akhf7ccc3ajapf8y4bb6"; - revision = "1"; - editedCabalFile = "0nqvb9g1wxz7ydpx9qc9lq9piwsy5zfk454v7mxlwng4i1jsgpk1"; + version = "0.11.7.7"; + sha256 = "0aza9w7ny1aangaspg4wkzhy0s26ngvfdq4zrd24iha1d9qh4nq8"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -11881,8 +11905,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.1"; - sha256 = "0nccfhm8a30ckl5lkaah0nhyikwry12d832wcknzl14jpj6r116d"; + version = "0.3.3.3"; + sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12405,10 +12429,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.3.8"; - sha256 = "0gmndzcbqys34sf6y8db13r5gaqa1cp9zxyb4vav788m6p5gd86k"; - revision = "2"; - editedCabalFile = "0xc9qlfgrlf6v4h5m9rcwy58wsa4ksm8fpnx3fyh5ld9x3nhgfpd"; + version = "3.3.9"; + sha256 = "0kc68bjj3izbdvw67kyzg74fv1ksj2dclq5gxzlnajv87rfsqi1y"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -14305,8 +14327,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.8.0"; - sha256 = "1k96nngfn57fb81wxpkksnmvq2nr7davn8wdwix2w2pk5v67m3fw"; + version = "0.9.11.0"; + sha256 = "1iclg19sxirz7p4r5q2r42w4iibswfinqkn45xqw6h617crwl2pk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -15196,8 +15218,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.4.0.1"; - sha256 = "1g32iiwrs2fhf7l4sjc2l0s51yc3a102scvbwq1ip7532bvmwy23"; + version = "3.4.0.2"; + sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16443,8 +16465,8 @@ self: { pname = "PSQueue"; version = "1.2.0"; sha256 = "1rkvaz6gjh6cg9an67nly82v5wvpjrrh7qdlb5q2lc3zpr3kh01r"; - revision = "1"; - editedCabalFile = "17np95rwys8rlzlw7g7nsiwipzb5hxwh7frj6ffyrm0sb7jmf126"; + revision = "2"; + editedCabalFile = "1cxv515z5ni102jwgadzsnaphimldrjz1klg33dbha87yblj2pgv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Priority Search Queue"; @@ -17411,26 +17433,6 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.11.2.1"; - sha256 = "02i2h8dj228w0d4vsjrllrc25hgmx7wys2jzlgq61z13jddc8rg8"; - libraryHaskellDepends = [ - base bytestring ghc mtl parsec template-haskell text time - ]; - testHaskellDepends = [ - base bytestring deepseq filepath hspec HUnit process - template-haskell temporary text time - ]; - description = "Quasiquotations for a python like interpolated string formatter"; - license = lib.licenses.bsd3; - }) {}; - - "PyF_0_11_3_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq, filepath, ghc, hspec - , HUnit, mtl, parsec, process, template-haskell, temporary, text - , time - }: - mkDerivation { - pname = "PyF"; version = "0.11.3.0"; sha256 = "1nwn3pf3wmi08jrfrmk8rbgfviha48ackm6crxrsxxcmmlrmsncy"; libraryHaskellDepends = [ @@ -17442,7 +17444,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formatter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "QIO" = callPackage @@ -17568,14 +17569,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "QuickCheck_2_15" = callPackage + "QuickCheck_2_15_0_1" = callPackage ({ mkDerivation, base, containers, deepseq, process, random , splitmix, template-haskell, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.15"; - sha256 = "10hd896c8vb19aj3q0dg90aymsiq73ffxgx8z1p39w7x21m2vdnc"; + version = "2.15.0.1"; + sha256 = "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"; libraryHaskellDepends = [ base containers deepseq random splitmix template-haskell transformers @@ -17764,20 +17765,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "RLP" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec }: - mkDerivation { - pname = "RLP"; - version = "1.1.1"; - sha256 = "075hv3ljc47zr5xkvmbiqq666cgicvwl90isq2n45x9nsbg441d1"; - libraryHaskellDepends = [ base binary bytestring ]; - testHaskellDepends = [ base binary bytestring hspec ]; - description = "RLP serialization as defined in Ethereum Yellow Paper"; - license = lib.licenses.lgpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "RMP" = callPackage ({ mkDerivation, allocated-processor, base, canlib, cv-combinators , ftd2xx, HOpenCV, vector-space @@ -22888,12 +22875,12 @@ self: { "WringTwistree" = callPackage ({ mkDerivation, arithmoi, array, base, bytestring, containers , deepseq, mod, multiarg, parallel, sort, split, tasty, tasty-hunit - , tasty-quickcheck, utf8-string, vector + , tasty-quickcheck, terminal-progress-bar, utf8-string, vector }: mkDerivation { pname = "WringTwistree"; - version = "0.0.1.1"; - sha256 = "10hbg89y1bs4b8nmw3v5amffgmjmija89c639mk9g8hs3zddgb53"; + version = "0.1.0.0"; + sha256 = "1zslzl8ffw9bf3lm21zj7hr9xsd4503cmvznzsl9fsqgp8ssy533"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22902,7 +22889,7 @@ self: { ]; executableHaskellDepends = [ arithmoi array base bytestring containers deepseq multiarg parallel - sort split utf8-string vector + sort split terminal-progress-bar utf8-string vector ]; testHaskellDepends = [ array base bytestring containers tasty tasty-hunit tasty-quickcheck @@ -23328,8 +23315,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.8"; - sha256 = "0w33n17haja7jzwhha7j6psqkcyq0k06ddckbs96yqldmq96il18"; + version = "0.14.9"; + sha256 = "0khlr63l3xrhylapr5ql62b3kzfak97vlz1cjd15pzfain7pvbds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25403,8 +25390,8 @@ self: { pname = "active"; version = "0.2.1"; sha256 = "150kwir36aj9q219qi80mlqd0vxm4941dh6x4xp58rbd5a3mhmv1"; - revision = "2"; - editedCabalFile = "16gc6vksf5gn5v6m9zbiphb2bd2chbypk8iykn1y7ak3f8g30asn"; + revision = "3"; + editedCabalFile = "0hpnbr1q5nkqp4l7hycba6lnmw22b0ccv2l62lqvis96xw47n75k"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -26050,8 +26037,8 @@ self: { pname = "aeson"; version = "2.1.2.1"; sha256 = "1ii26lz9czxqhck11pzhqlhfhm9zgbrhiydv4gh1w66f0fwl4h2x"; - revision = "3"; - editedCabalFile = "19qj4s625b34kw8ryb2ji0hs6dg2m116x913s722bab316k653av"; + revision = "4"; + editedCabalFile = "0lb30fwqr6q3xzvhi3vv2g0yw3bmwmzfp45jsplhakq2mmzbxa5a"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist exceptions generically ghc-prim hashable @@ -26073,7 +26060,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson_2_2_2_0" = callPackage + "aeson_2_2_3_0" = callPackage ({ mkDerivation, base, base-compat, base-orphans, base16-bytestring , bytestring, character-ps, containers, data-fix, deepseq, Diff , directory, dlist, exceptions, filepath, generic-deriving @@ -26087,10 +26074,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "2.2.2.0"; - sha256 = "0xk2zl4j64zjymib0qyx889jyghx0fa1nvsz0fx2py9kcd2f3gdk"; - revision = "1"; - editedCabalFile = "18kglyqghxv5gpp9c8kn2rr0h2c09x3rw9rl3a4j3h2l23y0s3dc"; + version = "2.2.3.0"; + sha256 = "1akbrh8iz47f0ai30yabg1n4vcf1fx0a9gzj45fx0si553s5r8ns"; libraryHaskellDepends = [ base bytestring character-ps containers data-fix deepseq dlist exceptions generically ghc-prim hashable indexed-traversable @@ -26512,8 +26497,8 @@ self: { }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.5.1"; - sha256 = "15d706h09igm9ic0sgjamwngghvcqhs2pir5pqb2crlkvmhr25cb"; + version = "0.2.5.2"; + sha256 = "16lzp5rjjsj3l5bazc33r6pn6llz2ycfikxsvzk6bf5b157gzpjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27712,8 +27697,8 @@ self: { }: mkDerivation { pname = "airgql"; - version = "0.7.1.2"; - sha256 = "1fcin7c223xfgyksa50dw8vnxvs0rkwzi16ia5x0rrnfsjv83jwm"; + version = "0.7.1.3"; + sha256 = "1vb5qmvdm803nllfddzh6q89ln5ldxy974yj4v36gjmaqs3wq2dg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27823,15 +27808,16 @@ self: { "aivika-distributed" = callPackage ({ mkDerivation, aivika, aivika-transformers, array, base, binary , containers, distributed-process, exceptions, mtl, mwc-random - , random, stm, time + , random, stm, time, vector }: mkDerivation { pname = "aivika-distributed"; - version = "1.4"; - sha256 = "0fpl6xa32w4f1bl4l8b5pwagm68k42nn45w7d1hsh9ffy4bfsq0k"; + version = "1.5"; + sha256 = "0j9hz6jvp46awnnhmlvam68p7w2ms7lkjfzkils8w063ywphph6q"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time + vector ]; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = lib.licenses.bsd3; @@ -36241,6 +36227,35 @@ self: { mainProgram = "amqp-builder"; }) {}; + "amqp_0_23_0" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, containers + , crypton-connection, data-binary-ieee754, data-default-class + , hspec, hspec-expectations, monad-control, network, network-uri + , split, stm, text, vector, xml + }: + mkDerivation { + pname = "amqp"; + version = "0.23.0"; + sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock containers crypton-connection + data-binary-ieee754 data-default-class monad-control network + network-uri split stm text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock containers crypton-connection + data-binary-ieee754 data-default-class hspec hspec-expectations + network network-uri split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "amqp-builder"; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -36752,8 +36767,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, QuickCheck, vector }: mkDerivation { pname = "anitomata"; - version = "0.1.0.0"; - sha256 = "1gswhhwrjkhy90x23r0lnlyii07vjc85h99b265pm8fzqqgcdyqf"; + version = "0.1.0.2"; + sha256 = "01c1cjczb2mvgl93iqf3zg9sm9rz307bi8f96nk113r036db6nh9"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base hspec QuickCheck vector ]; testToolDepends = [ hspec-discover ]; @@ -36768,8 +36783,8 @@ self: { }: mkDerivation { pname = "anitomata-aseprite"; - version = "0.1.1.0"; - sha256 = "0qskdfj595gwppaj34krsdfmk8vjwzmrig8ajaddni7znag89gl4"; + version = "0.1.1.2"; + sha256 = "177gqb3p64h8ymw5i20fd0xba1hqcw4j4prqnp6hs1h6wgrcmppq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38655,6 +38670,17 @@ self: { broken = true; }) {}; + "applicative-logic" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "applicative-logic"; + version = "0.1.0.2"; + sha256 = "0jr81m0mksfxbvzjs3c73kilr09w4gh7zv1amdx9xcvq5zb96imd"; + libraryHaskellDepends = [ base ]; + description = "Generalized logic operations for Applicative and Alternative functors"; + license = lib.licenses.bsd3; + }) {}; + "applicative-numbers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39720,8 +39746,6 @@ self: { ]; description = "Memory-hard password hash and proof-of-work function"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "argparser" = callPackage @@ -39954,8 +39978,8 @@ self: { pname = "arithmoi"; version = "0.13.0.0"; sha256 = "0bcxfx8gm0vd07pg417yid11dqakgw5w1hndmg8667g92ar5njsc"; - revision = "3"; - editedCabalFile = "1v8d7dpzlqqmlfmwb0jylic09yr3f69wpkqxp8kyy1hgbczaig3l"; + revision = "4"; + editedCabalFile = "1dmmbf3bcs4x0w9f609zrwnvrn9ngcqv9l5xgwhf0qxgpizgps2q"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -41980,6 +42004,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "atomic-primops_0_8_8" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.8"; + sha256 = "1sp7ffyybnvq9s0b73rr33wjck3ffip2v56q1l87d1r5150wwh60"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "atomic-primops-foreign" = callPackage ({ mkDerivation, base, bits-atomic, HUnit, test-framework , test-framework-hunit, time @@ -42542,8 +42578,8 @@ self: { }: mkDerivation { pname = "attoparsec-framer"; - version = "0.1.0.3"; - sha256 = "0lwrnka25f5a27ym3w48qdrkv3q62q9rs5r6kpgbr7nckcmb9b03"; + version = "0.1.0.4"; + sha256 = "1ijb8br55pchrn525dhsqhmpy9mlzg6as40mpjgmv567ngjp4ia5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42561,6 +42597,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-framer_0_1_0_5" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , exceptions, hspec, network, network-run, QuickCheck, text + }: + mkDerivation { + pname = "attoparsec-framer"; + version = "0.1.0.5"; + sha256 = "003c40fsvh94v6fdgp4rdx6s109iww5n60n7z2nn7l5zqf44mshj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring exceptions text + ]; + executableHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions network + network-run QuickCheck text + ]; + testHaskellDepends = [ + attoparsec attoparsec-binary base bytestring exceptions hspec + QuickCheck text + ]; + description = "Use Attoparsec to parse framed protocol byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "attoparsec-ip" = callPackage ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty , tasty-quickcheck, text, vector @@ -42583,21 +42645,6 @@ self: { }: mkDerivation { pname = "attoparsec-iso8601"; - version = "1.1.0.1"; - sha256 = "0swi953apv2mm1q213afxiv2mmknzz5pmpdk824n1s26rfwny83k"; - libraryHaskellDepends = [ - attoparsec base integer-conversion text time time-compat - ]; - description = "Parsing of ISO 8601 dates, originally from aeson"; - license = lib.licenses.bsd3; - }) {}; - - "attoparsec-iso8601_1_1_1_0" = callPackage - ({ mkDerivation, attoparsec, base, integer-conversion, text, time - , time-compat - }: - mkDerivation { - pname = "attoparsec-iso8601"; version = "1.1.1.0"; sha256 = "0yn9l9drza1wcj59a9dzm4vnihwmsxk6zd3fqg6kgww1an8x3k9l"; libraryHaskellDepends = [ @@ -42605,7 +42652,6 @@ self: { ]; description = "Parsing of ISO 8601 dates, originally from aeson"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iteratee" = callPackage @@ -43235,21 +43281,6 @@ self: { }) {}; "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "2.0.0.9"; - sha256 = "1rkql1v29gsgq3y9gmsrfxgm43rgwhk32g32gjxbfgr4ky79696g"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; - license = lib.licenses.mit; - mainProgram = "autoexporter"; - }) {}; - - "autoexporter_2_0_0_12" = callPackage ({ mkDerivation, base, Cabal-syntax, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -43261,7 +43292,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatically re-export modules"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "autoexporter"; }) {}; @@ -43314,8 +43344,8 @@ self: { }: mkDerivation { pname = "automaton"; - version = "1.3"; - sha256 = "04mgsc9cg1w9afica540mgxykdnid4d88j1dn3lnlsm2z3gkh2gx"; + version = "1.4"; + sha256 = "0g04as057ya3r698q8kwc73lzj2pzqwns7pd6dy84qs7rsxyj1fj"; libraryHaskellDepends = [ base mmorph MonadRandom mtl profunctors selective semialign simple-affine-space these transformers @@ -45837,12 +45867,12 @@ self: { broken = true; }) {}; - "base_4_20_0_0" = callPackage + "base_4_20_0_1" = callPackage ({ mkDerivation, ghc-internal, ghc-prim }: mkDerivation { pname = "base"; - version = "4.20.0.0"; - sha256 = "15l9g5v12411baix23ck30s2633mw957xsh2bnxjlrcqjfpqhqbw"; + version = "4.20.0.1"; + sha256 = "0pg93zvlvx56ffz8b2gf920an4jzqyd1305h59c7slx51ibf2aww"; libraryHaskellDepends = [ ghc-internal ghc-prim ]; description = "Core data structures and operations"; license = lib.licenses.bsd3; @@ -46305,6 +46335,8 @@ self: { pname = "base64"; version = "1.0"; sha256 = "1dmjy4pkz66s3wa99lkc0wc4bdjkdkr57a8rsgb5z50432gj6hkr"; + revision = "1"; + editedCabalFile = "0b02k2r5dkzm8rapypkcjl08mz97z5qh4yfxyxn0vwq5hmh8905b"; libraryHaskellDepends = [ base bytestring deepseq text text-short ]; @@ -47537,8 +47569,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.8"; - sha256 = "06wnlshgf2anp3xg3vf0cz6lxjn0rpfvnjfn568dj007km8y2n9p"; + version = "0.14.9"; + sha256 = "10xcl4nms1bcfni9z7mqirf6ifii99y6yb16r2pwrfs20vnhwx7w"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -47570,37 +47602,6 @@ self: { }: mkDerivation { pname = "bech32"; - version = "1.1.6"; - sha256 = "03a0xf1c7zjirg4y3rv0frrqifzqsqx327hdcvxzbpgflwgs225h"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers extra text - ]; - executableHaskellDepends = [ - base base58-bytestring bytestring extra memory optparse-applicative - prettyprinter prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ - base base58-bytestring bytestring containers deepseq extra hspec - memory process QuickCheck text vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - mainProgram = "bech32"; - broken = true; - }) {}; - - "bech32_1_1_7" = callPackage - ({ mkDerivation, array, base, base58-bytestring, bytestring - , containers, deepseq, extra, hspec, hspec-discover, memory - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , process, QuickCheck, text, vector - }: - mkDerivation { - pname = "bech32"; version = "1.1.7"; sha256 = "1ql79scbjxrmllizywhzdys1bx565lqvj81851wzdkww662lhvpg"; isLibrary = true; @@ -47630,22 +47631,6 @@ self: { }: mkDerivation { pname = "bech32-th"; - version = "1.1.6"; - sha256 = "0y1hw7419sw84gs13wh40qj9m1snyz0ly5aasmkynjpb9ixhn54k"; - libraryHaskellDepends = [ base bech32 template-haskell text ]; - testHaskellDepends = [ base bech32 hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Template Haskell extensions to the Bech32 library"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - }) {}; - - "bech32-th_1_1_7" = callPackage - ({ mkDerivation, base, bech32, hspec, hspec-discover - , template-haskell, text - }: - mkDerivation { - pname = "bech32-th"; version = "1.1.7"; sha256 = "0a71jcvgnfsn24d2bppiprx4yb5cnsr85rsgzax3547shiqpli1n"; libraryHaskellDepends = [ base bech32 template-haskell text ]; @@ -48669,6 +48654,22 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "bin_0_1_4" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, fin, hashable + , QuickCheck, some + }: + mkDerivation { + pname = "bin"; + version = "0.1.4"; + sha256 = "0amz5naq6p2jpm4rb9ycjg7j75qylp3d689cl55f71rs2idrazpp"; + libraryHaskellDepends = [ + base boring dec deepseq fin hashable QuickCheck some + ]; + description = "Bin: binary natural numbers"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "binance-exports" = callPackage ({ mkDerivation, aeson, base, bytedump, bytestring, cassava , cmdargs, cryptohash-sha256, directory, hedgehog, http-client @@ -48926,6 +48927,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "binary-instances_1_0_5" = callPackage + ({ mkDerivation, aeson, base, binary, binary-orphans, bytestring + , case-insensitive, hashable, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck + , text, time-compat, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-instances"; + version = "1.0.5"; + sha256 = "01ycp0dn96n4zavrw1rr5ly0isr3kq16jihwcdg6c022v9w73wkf"; + libraryHaskellDepends = [ + aeson base binary binary-orphans case-insensitive hashable + primitive scientific tagged text time-compat unordered-containers + vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary bytestring case-insensitive hashable primitive + QuickCheck quickcheck-instances scientific tagged tasty + tasty-quickcheck text time-compat unordered-containers vector + ]; + description = "Orphan instances for binary"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-io" = callPackage ({ mkDerivation, async, base, binary, bytestring, concurrency , deque, exceptions, hspec, process, stm, transformers @@ -48977,26 +49004,6 @@ self: { "binary-orphans" = callPackage ({ mkDerivation, base, binary, OneTuple, QuickCheck , quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "binary-orphans"; - version = "1.0.4.1"; - sha256 = "1lphlb7nar3d9db87wl0sh6srx03dad2ssxqak8bn9bdr2dphnsz"; - revision = "3"; - editedCabalFile = "085flwx82nvvyb479jma9j62q8i9sbz65rarsqhasgz4vczxqawx"; - libraryHaskellDepends = [ base binary transformers ]; - testHaskellDepends = [ - base binary OneTuple QuickCheck quickcheck-instances tagged tasty - tasty-quickcheck - ]; - description = "Compatibility package for binary; provides instances"; - license = lib.licenses.bsd3; - }) {}; - - "binary-orphans_1_0_5" = callPackage - ({ mkDerivation, base, binary, OneTuple, QuickCheck - , quickcheck-instances, tagged, tasty, tasty-quickcheck }: mkDerivation { pname = "binary-orphans"; @@ -49009,7 +49016,6 @@ self: { ]; description = "Compatibility package for binary; provides instances"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -49110,8 +49116,8 @@ self: { pname = "binary-serialise-cbor"; version = "0.2.2.0"; sha256 = "16yhimka17dza5nda62927k5x66c0yrsxzz92kya3gicd6vaga2g"; - revision = "1"; - editedCabalFile = "1kampfsd9mm2qv726v4dyq0ssx8ismj4hjm61h0jjx9644c8cr18"; + revision = "2"; + editedCabalFile = "1ff948jlri6dz86l45bzlv057mazl1jw1kvj0m8awmy5w4xhjhmp"; libraryHaskellDepends = [ base bytestring cborg serialise ]; description = "Yet Another Binary Serialisation Library (compatibility shim)"; license = lib.licenses.bsd3; @@ -53061,8 +53067,8 @@ self: { pname = "bm"; version = "0.2.0.0"; sha256 = "17dnv1vdsh43nc8b0p92d01nz1zvxd9bfcghlz0w6c8wc5yflg31"; - revision = "4"; - editedCabalFile = "11mj69y43chqr50m9g8shqdyc3q31hha9gjqx05dn1dnkz3xgzxb"; + revision = "5"; + editedCabalFile = "0db964rq3sxrsa23vxk7sj1cqfxzyv375grxrfnxf0m1sf2finfn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53082,10 +53088,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bmp"; - version = "1.2.6.3"; - sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw"; - revision = "2"; - editedCabalFile = "05ywlglsg9jw1cgdhrz9f4vbm775yvyysmmvjs0xj0dm2ljyskrx"; + version = "1.2.6.4"; + sha256 = "0ifk160rdc7428zkd6a3wfn2c6iv805z731gvbpm58jyv4q7jbhn"; libraryHaskellDepends = [ base binary bytestring ]; description = "Read and write uncompressed BMP image files"; license = lib.licenses.mit; @@ -53695,8 +53699,8 @@ self: { }: mkDerivation { pname = "boomerang"; - version = "1.4.9.2"; - sha256 = "15y098dsbaxk6hyjziwc24yrhv0276jpr3ahp4zlgcyl3axpsncq"; + version = "1.4.9.3"; + sha256 = "1ilai1svi9j10wjll1r082v76299jnd7nznk7bxqgnvn59n43xik"; libraryHaskellDepends = [ base mtl semigroups template-haskell text th-abstraction ]; @@ -53941,25 +53945,11 @@ self: { ({ mkDerivation, base, tagged, transformers }: mkDerivation { pname = "boring"; - version = "0.2.1"; - sha256 = "0m1imbkvwfjz7cz7ibksiz63fyfmaq42f6x059sch2nmz7qdvzxi"; - revision = "1"; - editedCabalFile = "0jrfhidd91k0bkb98qm8nvv9wizqa906mgr8qjkhxc4d7vcnc9cy"; - libraryHaskellDepends = [ base tagged transformers ]; - description = "Boring and Absurd types"; - license = lib.licenses.bsd3; - }) {}; - - "boring_0_2_2" = callPackage - ({ mkDerivation, base, tagged, transformers }: - mkDerivation { - pname = "boring"; version = "0.2.2"; sha256 = "11pgndkjvy2j0jfaww92nmlkn2r27v6a253hzdc7dcb9zwgsz2wj"; libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "boring-game" = callPackage @@ -54004,8 +53994,8 @@ self: { pname = "borsh"; version = "0.3.0"; sha256 = "1y3jirkiyq6hvmsga1g7iyrz90zldm97a97zzfv9krqnjg9vbljn"; - revision = "1"; - editedCabalFile = "0ffl1lyx4pxdy1iipadvg3n3ph5iflkn33158vka3nhlhycy96f4"; + revision = "2"; + editedCabalFile = "1n0566adpwq8y3vs1clzr487biz31zc3648ccqsmw6r7aj15vfg0"; libraryHaskellDepends = [ base bytestring containers generics-sop sop-core text vector wide-word @@ -54589,8 +54579,8 @@ self: { }: mkDerivation { pname = "breakpoint"; - version = "0.1.3.1"; - sha256 = "1ayf9mwlcawdlr5pm86zca6zwvi7gcrz3vxpmjflz0vlkzsi9nfc"; + version = "0.1.4.0"; + sha256 = "04fgivxwddm8r5hpj8a1v6r4c59yj618cq14rszrd1qrm9sn1qf6"; libraryHaskellDepends = [ ansi-terminal base containers deepseq ghc haskeline mtl pretty-simple template-haskell text transformers @@ -56245,26 +56235,6 @@ self: { }: mkDerivation { pname = "burrito"; - version = "2.0.1.9"; - sha256 = "0sz9j9yv7whwvxrnh4v3r5fz8z4v9c7c2s45kpvsgvshds9vbr7f"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ - base bytestring containers hspec parsec QuickCheck template-haskell - text transformers - ]; - description = "Parse and render URI templates"; - license = lib.licenses.mit; - }) {}; - - "burrito_2_0_1_10" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; version = "2.0.1.10"; sha256 = "1c8nfh90x0s7ccjznlkk73k99bk2c3n6rdfaw5pszad7ma8zmmc4"; libraryHaskellDepends = [ @@ -56274,7 +56244,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -57213,6 +57182,8 @@ self: { pname = "bytestring-lexing"; version = "0.5.0.12"; sha256 = "09g5x7jwz9kby578rlj8c6f6zi0pzs169rsqd1vsn3q9gimkpj3j"; + revision = "1"; + editedCabalFile = "0zpqxy4n8mkf6ccmc3jb6ggrqmw9csh1nj08wwq196np28jsbkdv"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring tasty tasty-quickcheck tasty-smallcheck @@ -57553,6 +57524,8 @@ self: { pname = "bytezap"; version = "1.3.0"; sha256 = "0ichvvl1f76m520q3pq0m90wi4f0gzmhbsxkk5xnh72kdbaj164h"; + revision = "1"; + editedCabalFile = "1vqd9hssgdzc8v8rhnzid0bbbld6g5pyfbk7ps8d12l7f0346l4m"; libraryHaskellDepends = [ base bytestring defun-core generic-type-functions primitive text type-level-bytestrings @@ -58060,8 +58033,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.3.0"; - sha256 = "106q5imjznbh7x2pvvgfsn8qx1awb00w0mgfrkkzbwnwc3g8jnw3"; + version = "2.5.0"; + sha256 = "0ddd6yc9ii7ibw7263aq455hwk50ggij28ycjvfi9p4cl6npp1f9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58158,8 +58131,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.3.0"; - sha256 = "08n2n0p3m282yx7cf1nzmlfmw0xikqwrj3l1s8jmx18z2gh0x1h4"; + version = "1.5.0"; + sha256 = "0dmhxrg8d7ajhfg85s7p6py9fywqbrnbd5z9i6mbh3f6cyc9hqak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58532,23 +58505,23 @@ self: { "cabal-gild" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, containers - , directory, exceptions, filepath, hspec, parsec, pretty, temporary - , text, transformers + , directory, exceptions, filepath, filepattern, hspec, parsec + , pretty, temporary, text, transformers }: mkDerivation { pname = "cabal-gild"; - version = "1.3.1.2"; - sha256 = "15ds4x9vh5hfxbrh8k3w719jxs1mfhx8kaj035nj891r5c6llpb2"; + version = "1.4.0.0"; + sha256 = "0yr7g34vqly9w1pn1h90sr506v42wv69y85dgfx8p8r1svfiz1ra"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal-syntax containers directory exceptions - filepath parsec pretty text transformers + base bytestring Cabal-syntax containers exceptions filepath + filepattern parsec pretty text transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - temporary transformers + base bytestring containers directory exceptions filepath + filepattern hspec temporary transformers ]; description = "Formats package descriptions"; license = lib.licenses.mit; @@ -58785,8 +58758,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.6.1.1"; - sha256 = "1w4kbc7435qbkflb8rkmfgyqw3fynyfqgvy4mxay1r1zfknqvq0b"; + version = "0.6.2"; + sha256 = "1362p021irm0kaz7n8gdjy1ppjk914zza114cmpm87ris0i1a9jn"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal-syntax containers cryptohash-sha256 deepseq directory @@ -58854,8 +58827,8 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.10.1"; - sha256 = "0pjzz5d2s6b2xaqgb7z3ry5zpba84x3iy2hw3a7xq32ciyl3gnhb"; + version = "0.14.0"; + sha256 = "0ab6j4svnchw741spi1b4zsdiwr7hvl141dn30ggqq6lkn32icwm"; libraryHaskellDepends = [ base Cabal lens strict system-fileio system-filepath text transformers unordered-containers @@ -58999,6 +58972,35 @@ self: { mainProgram = "cabal-plan"; }) {}; + "cabal-plan_0_7_4_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base + , base16-bytestring, bytestring, containers, directory, filepath + , mtl, optics-core, optparse-applicative, parsec, process + , semialign, singleton-bool, text, these, topograph, transformers + , vector + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.7.4.0"; + sha256 = "10x69i01q8nmdq5q2523rmqfn5nglvmbdysgdn46h1iw2gavar76"; + configureFlags = [ "-fexe" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal async base bytestring containers directory mtl + optics-core optparse-applicative parsec process semialign + singleton-bool text these topograph transformers vector + ]; + description = "Library and utility for processing cabal's plan.json file"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + mainProgram = "cabal-plan"; + }) {}; + "cabal-plan-bounds" = callPackage ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax , containers, optparse-applicative, pretty, text @@ -59792,8 +59794,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "1.7.3"; - sha256 = "0xgcqgdawzb8ckdc4w0yp5lbdxmj3cd0w93wzp2nx585pi1ils7i"; + version = "1.7.4"; + sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59837,8 +59839,8 @@ self: { }: mkDerivation { pname = "cachix-api"; - version = "1.7.3"; - sha256 = "0srzvhmvp927qnk31p0nlal7wl14205s1a27frj68g2yi4a1w92j"; + version = "1.7.4"; + sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; libraryHaskellDepends = [ aeson async base bytestring conduit cryptonite deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet @@ -62572,6 +62574,8 @@ self: { pname = "cborg"; version = "0.2.10.0"; sha256 = "15y7p5rsv76fpklh4rgrxlxxaivpbchxdfdw96mqqjgw7060gzhp"; + revision = "1"; + editedCabalFile = "0x48942znc78nh63lxibaascaj1wxsqjg7r4vifisl9zlzccpcpp"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-bignum ghc-prim half primitive text @@ -62595,8 +62599,8 @@ self: { pname = "cborg-json"; version = "0.2.6.0"; sha256 = "1p6xdimwypmlsc0zdyw1vyyapnhwn2g8b9n0a83ca6h4r90722yv"; - revision = "1"; - editedCabalFile = "0bgr0m1p4r2snp8d1irsyql2a9kcpp09lkajjfsyqq8riaf75a2v"; + revision = "2"; + editedCabalFile = "1vj7p8k3ksb6fizsl39rb99zsjfh1wm7i9q9m18s4c8llnylhw0a"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring cborg scientific text unordered-containers vector @@ -63679,6 +63683,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "char-boxdrawing" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "char-boxdrawing"; + version = "1"; + sha256 = "1nbylqdk8x615kjbpxqa7wp8m75iq7akva8ridym3jsnjhhp7rgn"; + libraryHaskellDepends = [ base ]; + description = "Combinators for unicode or ASCII box drawing characters"; + license = lib.licenses.bsd3; + }) {}; + "char-decode" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty , tasty-quickcheck, text @@ -64196,8 +64211,8 @@ self: { ({ mkDerivation, base, containers, doctest, QuickCheck }: mkDerivation { pname = "check-cfg-ambiguity"; - version = "0.1.0.0"; - sha256 = "0iswfg7m9qnhr1128xbhaa06ai2rhnr7c781y7z92v29xd7mjyjg"; + version = "0.1.1.0"; + sha256 = "1h3i3hk6ggsxgcxih0mwljfli0gn8ja7d2vkzz7gxqppwx9ryirj"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "Checks context free grammar for ambiguity using brute force up to given limit"; @@ -64642,8 +64657,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "choice"; - version = "0.2.3"; - sha256 = "15nls2azmhwi3nnf5rkl954pa0bjgi231ff74hgw8r3nb5axrgrn"; + version = "0.2.4.1"; + sha256 = "099c5ibal8llzr5nh62dnpb1pwj30gxqwdcjx0rds51ga2j32z5i"; libraryHaskellDepends = [ base ]; description = "A solution to boolean blindness"; license = lib.licenses.publicDomain; @@ -66619,6 +66634,8 @@ self: { pname = "clay"; version = "0.15.0"; sha256 = "1gp7x76cw15jmd3ahqf1q0bc2p6ix182x6s2pzyh8yr4b29b9r3v"; + revision = "1"; + editedCabalFile = "0y6s4digka4b0d238n1vcj2308csxvkr34vfnqr3mc46079vb99k"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-discover mtl text ]; testToolDepends = [ hspec-discover ]; @@ -67173,6 +67190,8 @@ self: { pname = "cli-extras"; version = "0.2.1.0"; sha256 = "1lg0ssbh2qhjjc31ins29ddy4lkzwxhlm3r9vcy1jk8al5aqa03f"; + revision = "1"; + editedCabalFile = "0fcybjf8zqzzjzfc5205plzphzk7z5v9p8nadqq7lp7m10ggjasc"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions io-streams lens logging-effect monad-logger monad-loops mtl process @@ -67189,8 +67208,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.2.0.0"; - sha256 = "0sv4ycc6n54419bcg0i6vh8l5a1370l0k1qg9n1nydb9wx5n7927"; + version = "0.2.0.1"; + sha256 = "09i3v77xhdfsmvq7c10plxnqmq2wn8gxc16za4h96s7pnvn8bppv"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text which @@ -67208,6 +67227,8 @@ self: { pname = "cli-nix"; version = "0.2.0.0"; sha256 = "02350jvbgapxn14zx0knzyxmdlrq2yk460wiw9p8aq860f299bzh"; + revision = "1"; + editedCabalFile = "1plh0js8lnl2xw3dv5z57ap8g4c9j2n1bzskn993fpgafqlw5mcb"; libraryHaskellDepends = [ base cli-extras data-default exceptions lens logging-effect mtl text which @@ -67812,21 +67833,23 @@ self: { }) {}; "clplug" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit, mtl - , network, text + ({ mkDerivation, aeson, attoparsec, attoparsec-aeson, base + , bytestring, conduit, mtl, network, stm, text }: mkDerivation { pname = "clplug"; - version = "0.4.0.0"; - sha256 = "02gixg9xww0gis67rap70pwbrg4gpi514iphbfjqjzbh2chdil5j"; + version = "1.0.0.0"; + sha256 = "0x42kx8ia9i3w3b0y3qn8fv6mc88w17nl82z08bsrh9hla2jl2i1"; libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec attoparsec-aeson base bytestring conduit mtl + network stm text ]; testHaskellDepends = [ - aeson attoparsec base bytestring conduit mtl network text + aeson attoparsec attoparsec-aeson base bytestring conduit mtl + network stm text ]; - description = "Create Core Lightning Plugins"; - license = lib.licenses.bsd3; + description = "Easily add functionality to your lightning node"; + license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68566,8 +68589,8 @@ self: { ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; - version = "0.3.2.1"; - sha256 = "11zzd18xpr9znqqk1kcj6c1nqg14x0g11vwd7v0y5h025bhah4ky"; + version = "0.3.2.2"; + sha256 = "1iydf4d9g2nq1aj993s8whp08xbf59071wf6md8zcq6xda8n3cpp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; @@ -68593,8 +68616,8 @@ self: { ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; - version = "0.0.1.4"; - sha256 = "1cah2a6hz8g30jqfq05r103sj42aix4hqdl8kys57zkfq2ap4myy"; + version = "0.0.1.5"; + sha256 = "1gh02nq42a97lvrqdsjzjjdpfwmdk0ax89fziw3pifdjqs446yz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base co-log-core polysemy ]; @@ -68987,8 +69010,8 @@ self: { }: mkDerivation { pname = "codet"; - version = "0.1"; - sha256 = "1npz5wfm9wk9pq4rpq9d8cwxawx75awbai1k5k62w620an0mq6xj"; + version = "0.1.0.1"; + sha256 = "0jv3z28sxdgmbpkxics2c8s4r576fz4r8dv7ai4yy1h4fqsli5vw"; libraryHaskellDepends = [ base bytestring containers template-haskell text time ]; @@ -69008,8 +69031,8 @@ self: { }: mkDerivation { pname = "codet-plugin"; - version = "0.1"; - sha256 = "1npmn69l8n3ni2nd83czq6vvh2j94ik56k9vmprb381mf00zbw5k"; + version = "0.1.0.1"; + sha256 = "11ddf0h01qw00q3dd7gk12j31b98ff0yv5jd04wwngkhpcbshgb6"; libraryHaskellDepends = [ base codet ghc ]; testHaskellDepends = [ base codet directory filepath syb tasty tasty-golden @@ -70196,31 +70219,6 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , non-empty, prelude-compat, primitive, QuickCheck, semigroups - , storable-record, storablevector, tagged, transformers - , transformers-compat, utility-ht - }: - mkDerivation { - pname = "comfort-array"; - version = "0.5.4.2"; - sha256 = "1fyv4m3qb6rbz1inswzwkbrza1wr3x5gr8p4qbh3bvfqfkj3mh4i"; - libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty prelude-compat - primitive QuickCheck semigroups storable-record storablevector - tagged transformers transformers-compat utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms containers deepseq doctest-exitcode-stdio - doctest-lib QuickCheck tagged utility-ht - ]; - description = "Arrays where the index type is a function of the shape type"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "comfort-array_0_5_5" = callPackage ({ mkDerivation, base, bifunctors, ChasingBottoms, containers , deepseq, doctest-exitcode-stdio, doctest-lib, guarded-allocation , non-empty, prelude-compat, primitive, QuickCheck, semigroups @@ -70242,7 +70240,6 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -70278,30 +70275,6 @@ self: { }: mkDerivation { pname = "comfort-blas"; - version = "0.0.2"; - sha256 = "1sw24ai7vlhxvb22y9qf71ak1l55chxdc6x1j5p7m40q5zmahpx6"; - libraryHaskellDepends = [ - base blas-ffi comfort-array containers deepseq guarded-allocation - netlib-ffi non-empty semigroups storablevector transformers - utility-ht - ]; - testHaskellDepends = [ - base comfort-array containers doctest-exitcode-stdio doctest-lib - netlib-ffi QuickCheck utility-ht - ]; - description = "Numerical Basic Linear Algebra using BLAS"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "comfort-blas_0_0_3" = callPackage - ({ mkDerivation, base, blas-ffi, comfort-array, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , netlib-ffi, non-empty, QuickCheck, semigroups, storablevector - , transformers, utility-ht - }: - mkDerivation { - pname = "comfort-blas"; version = "0.0.3"; sha256 = "1zadvjx095kxp4rl5ml120xh0ihaz7v5391fim5gdsgwdh00fwmp"; libraryHaskellDepends = [ @@ -70315,7 +70288,6 @@ self: { ]; description = "Numerical Basic Linear Algebra using BLAS"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -70590,6 +70562,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_5_5" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.5.5"; + sha256 = "0szi6rdl6cz39bj28mads5gxfyc5bp29gj6fr5y42v7spyn9f5kx"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -73672,8 +73666,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "4"; - editedCabalFile = "0c6dqygjnsyf986j2f10xvvzkq8h85sad0g9x7wxl42fxlcj1gb6"; + revision = "5"; + editedCabalFile = "0kzsc8v10h3jm2hxx9xc9nfp5f9qc2zp6gplsy4iszgis3spvq9a"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -73707,8 +73701,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "5"; - editedCabalFile = "159xbw9657j7icaway9vv22b0r8bz2s6c8v4w24sldzs7dcbc3sp"; + revision = "6"; + editedCabalFile = "0l4yw8g1f7isr2nj6s4awfm37b4j5pz2pn0wnzwdbain3az4d51v"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -74485,10 +74479,8 @@ self: { ({ mkDerivation, aeson, base, constraints, template-haskell }: mkDerivation { pname = "constraints-extras"; - version = "0.4.0.0"; - sha256 = "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn"; - revision = "2"; - editedCabalFile = "0q7kackfb5g9rin3lhccwsf33588f58a61zw7kbisfh6ygfpk6ww"; + version = "0.4.0.1"; + sha256 = "0c5cjh986rqf31f4igjbn72kgz8h9md6ivbyg2hn15kfawsgg47z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -76593,33 +76585,6 @@ self: { "country" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash - , byteslice, bytestring, compact, contiguous, deepseq, entropy - , gauge, hashable, primitive, primitive-unlifted, QuickCheck - , quickcheck-classes, scientific, tasty, tasty-quickcheck, text - , text-short, unordered-containers - }: - mkDerivation { - pname = "country"; - version = "0.2.4.1"; - sha256 = "1nn3vkyczpc3m4bxfkl6px893l63cp0281z4nlp2063d2azb20r8"; - libraryHaskellDepends = [ - aeson attoparsec base bytebuild bytehash byteslice bytestring - contiguous deepseq entropy hashable primitive primitive-unlifted - scientific text text-short unordered-containers - ]; - testHaskellDepends = [ - base byteslice primitive QuickCheck quickcheck-classes tasty - tasty-quickcheck text text-short - ]; - benchmarkHaskellDepends = [ - base bytehash byteslice bytestring compact gauge primitive text - ]; - description = "Country data type and functions"; - license = lib.licenses.bsd3; - }) {}; - - "country_0_2_4_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytebuild, bytehash , byteslice, bytestring, compact, contiguous, deepseq, gauge , hashable, primitive, primitive-unlifted, QuickCheck , quickcheck-classes, scientific, tasty, tasty-quickcheck, text @@ -76643,7 +76608,6 @@ self: { ]; description = "Country data type and functions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "country-codes" = callPackage @@ -76967,8 +76931,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "4.4.3"; - sha256 = "0pkxwpkiaj4aydifj45wqbhqzqrm92sspgc7m4j1dlxdsj6sbl6h"; + version = "4.4.4"; + sha256 = "0q79ay5zm196sn3xmak9f9swcrgakm9b9w5x86dc4340x30y7i2k"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -77581,15 +77545,15 @@ self: { broken = true; }) {}; - "crc32c_0_2_1" = callPackage + "crc32c_0_2_2" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hspec-core - , QuickCheck + , QuickCheck, system-cxx-std-lib }: mkDerivation { pname = "crc32c"; - version = "0.2.1"; - sha256 = "1w0zp11l6dd5harn3g3hv1zhcdd7wrx005cvwvf2c652k8dl42wf"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.2.2"; + sha256 = "1qblck677c2y5bxmnr36k0j248wkw6rmsdd2wc8li9lgdzjnnncm"; + libraryHaskellDepends = [ base bytestring system-cxx-std-lib ]; testHaskellDepends = [ base bytestring hspec hspec-core QuickCheck ]; @@ -79214,21 +79178,19 @@ self: { "crypton-x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, crypton, hourglass, memory, mtl, pem - , tasty, tasty-quickcheck, transformers, x509 + , tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "crypton-x509"; - version = "1.7.6"; - sha256 = "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb"; - revision = "2"; - editedCabalFile = "1bbn2yv2ldld1cszmq5bq6wplj53ssw2s24xb44c8lirlwrz59hr"; + version = "1.7.7"; + sha256 = "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers crypton hourglass memory pem transformers ]; testHaskellDepends = [ asn1-types base bytestring crypton hourglass mtl tasty - tasty-quickcheck x509 + tasty-quickcheck ]; description = "X509 reader and writer"; license = lib.licenses.bsd3; @@ -79512,8 +79474,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.6.1"; - sha256 = "02lyv19fq80msfsi77bgvwyh13nnvna9jgwwjz4482n8ynpm2h4i"; + version = "0.7.7.0"; + sha256 = "141ybd54bkppk1p2n5yspb99h1bnndvmr5703xffig6dx1nvc5ih"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -79541,8 +79503,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.4.3.1"; - sha256 = "1xcln5787bgiqp49xgf964jyhsgs0myjd669jbih1ihgpdk2032z"; + version = "5.4.4.1"; + sha256 = "13z3sp3q2bswkwlfaazyp964ar5l85k0xz68fajpmc2bkg32ivba"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -79557,17 +79519,17 @@ self: { ({ mkDerivation, array, base, base64-bytestring, Boolean , bytestring, cereal, cereal-text, containers, cryptohash-sha256 , data-default, data-fix, data-fix-cse, deriving-compat, dlist - , pretty-show, safe, text, transformers, unordered-containers - , vector, wl-pprint-text + , hashable, pretty-show, safe, text, transformers + , unordered-containers, vector, wl-pprint-text }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.9.1"; - sha256 = "1xz7cdwk7ck13ja70znlp8qs6f0vpsq5azmhv1kjdbmq4wkpq66g"; + version = "0.4.0.0"; + sha256 = "0kvirsagmlbgsrl9x8a0xmi9rypspsg85l7yqkk3cph4w4s60brl"; libraryHaskellDepends = [ array base base64-bytestring Boolean bytestring cereal cereal-text containers cryptohash-sha256 data-default data-fix data-fix-cse - deriving-compat dlist pretty-show safe text transformers + deriving-compat dlist hashable pretty-show safe text transformers unordered-containers vector wl-pprint-text ]; description = "dynamic core for csound-expression library"; @@ -79580,8 +79542,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.5.3"; - sha256 = "0psq8vyvv8mp9f506kv54j0gyfkjmzp9spmxjkjqjnzwlmya0nh6"; + version = "0.0.5.4"; + sha256 = "07lihnq0360vg6mbvwzgmangzvq796y9v55y33vaw9ppj8spifz3"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -79597,8 +79559,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.7.1"; - sha256 = "0fzlvs6an5q1lxycwifjhp3ydimky61kki1vb030vpmbhd15nczn"; + version = "0.2.9.0"; + sha256 = "0xj77qxdy2ryb4p3fl935bbh12alimih5cdvjk14059rdyj6fhlc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean bytestring colour containers csound-expression-dynamic @@ -79613,8 +79575,8 @@ self: { ({ mkDerivation, base, csound-expression, text, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.10.2"; - sha256 = "1xkv1q67fv5iggn63fz79rwz8m9i3jda26yfrdzh5l88f8lp6vb2"; + version = "0.0.11.0"; + sha256 = "16nrkz5mqjalapyn0skz4hvkqd9ysmpniiawxyrml5bs6sarch4l"; libraryHaskellDepends = [ base csound-expression text transformers ]; @@ -79744,8 +79706,8 @@ self: { }: mkDerivation { pname = "css-syntax"; - version = "0.1.0.1"; - sha256 = "1k0q7sznbkbiivj03n4zq2sm2hmhql5w2rxjp58mcq3b534p15y3"; + version = "0.1.0.2"; + sha256 = "10xl92ib6hkbqhr75n6nla1v1krx251k9k46jyvkr00kz0a9dpbr"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -80169,8 +80131,8 @@ self: { pname = "cue-sheet"; version = "2.0.2"; sha256 = "0n8a5m5qlz8dz03sphj9pybfjfkc0gngpmh56h6idj88frn1z947"; - revision = "3"; - editedCabalFile = "1qs26dnfk33bzlvj8mhaw8h1qrcviqyizzwhi58sff01zzcd0r2y"; + revision = "4"; + editedCabalFile = "1r2sf31lkmx5s48r7n0lcy2z1r2vkir8chnjcfd5hhjmpcbwrng1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -80317,6 +80279,7 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Currencies representation, pretty printing and conversion"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "currency" = callPackage @@ -80850,6 +80813,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "cvss" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, text }: + mkDerivation { + pname = "cvss"; + version = "0.1"; + sha256 = "02ldb650d053hisyb7fdd19x77k8sxvz4y939hj649pjl75b7qdr"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + description = "Common Vulnerability Scoring System"; + license = lib.licenses.bsd3; + }) {}; + "cybus" = callPackage ({ mkDerivation, adjunctions, base, checkers, deepseq, distributive , indexed-traversable, lens, mtl, pos, primus, profunctors @@ -81339,8 +81314,9 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, cryptonite, data-ordlist, directory, exceptions, fgl - , filepath, FindBin, hashable, haskeline, html, http-conduit + , containers, crypton-connection, cryptonite, data-default-class + , data-ordlist, directory, exceptions, fgl, filepath, FindBin + , hashable, haskeline, html, http-client-tls, http-conduit , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl , network, network-uri, old-time, parsec, process, QuickCheck , quickcheck-instances, regex-applicative, regex-base, regex-tdfa @@ -81353,20 +81329,21 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.18.2"; - sha256 = "11ikl5fx7xkr0zb4kam1hr8kcziz9dg00hqj0ygcpv321a552rg6"; + version = "2.18.3"; + sha256 = "16p6z21xiz8p3acj21wbkzr1flv5wsj17l16sa3l7gksj9idiaql"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring - conduit constraints containers cryptonite data-ordlist directory - exceptions fgl filepath hashable haskeline html http-conduit - http-types memory mmap mtl network network-uri old-time parsec - process regex-applicative regex-base regex-tdfa safe stm - strict-identity tar temporary terminal-size terminfo text time tls - transformers unix unix-compat utf8-string vector zip-archive zlib + conduit constraints containers crypton-connection cryptonite + data-default-class data-ordlist directory exceptions fgl filepath + hashable haskeline html http-client-tls http-conduit http-types + memory mmap mtl network network-uri old-time parsec process + regex-applicative regex-base regex-tdfa safe stm strict-identity + tar temporary terminal-size terminfo text time tls transformers + unix unix-compat utf8-string vector zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -85345,25 +85322,11 @@ self: { ({ mkDerivation, base, boring }: mkDerivation { pname = "dec"; - version = "0.0.5"; - sha256 = "126z70ij9hhy8pajw0d5fl0hrppy5sh22j8nkx46i0g6qz3l7071"; - revision = "2"; - editedCabalFile = "1vdnjlhbvh140ml0z4r2w5hl4x4c3fa0cnw68fl65l2mqld44i0h"; - libraryHaskellDepends = [ base boring ]; - description = "Decidable propositions"; - license = lib.licenses.bsd3; - }) {}; - - "dec_0_0_6" = callPackage - ({ mkDerivation, base, boring }: - mkDerivation { - pname = "dec"; version = "0.0.6"; sha256 = "0bbzn9kqb1zdvi4kd37p3lhx0rkdbyq98hqcn9qv5y67s6a3c5gv"; libraryHaskellDepends = [ base boring ]; description = "Decidable propositions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "decepticons" = callPackage @@ -86492,8 +86455,8 @@ self: { pname = "dependent-map"; version = "0.4.0.0"; sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; - revision = "1"; - editedCabalFile = "160p9crvlx1sn60inkwxa6mv1h2d4fgqnpsb2km67zrkpdfyd2s2"; + revision = "2"; + editedCabalFile = "18jqk1p4paaylqdvglw03v7fhyvlg59csl4kpf067wwpdpyaqs3l"; libraryHaskellDepends = [ base constraints-extras containers dependent-sum ]; @@ -86508,8 +86471,8 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.3"; - sha256 = "12kd8xr32zb21pvns3frabz5p8wlg6s3dcfgmam36hhv0d418r8l"; + version = "0.1.1.4"; + sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -86568,6 +86531,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; + revision = "1"; + editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -86957,6 +86922,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "derive-topdown_0_1_0_0" = callPackage + ({ mkDerivation, base, binary, containers, haskell-src, HUnit, mtl + , primitive, syb, template-haskell, th-abstraction, th-expand-syns + , transformers + }: + mkDerivation { + pname = "derive-topdown"; + version = "0.1.0.0"; + sha256 = "0pxv77r769wg61pp51ibvkd256f2cyrd9k5mrqz68dwi76xk54hr"; + libraryHaskellDepends = [ + base containers mtl primitive syb template-haskell th-abstraction + th-expand-syns transformers + ]; + testHaskellDepends = [ + base binary containers haskell-src HUnit mtl primitive syb + template-haskell th-abstraction th-expand-syns transformers + ]; + description = "Derive type class instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "derive-trie" = callPackage ({ mkDerivation, array, base, containers, template-haskell }: mkDerivation { @@ -88562,8 +88549,8 @@ self: { pname = "diagrams-core"; version = "1.5.1.1"; sha256 = "168kjikw3x21pjgfy3lmxmrm89g9zlhbypkmzdg5xz9rl7acn7rc"; - revision = "1"; - editedCabalFile = "1ii5qcwdzaljzq39vrvrsjf06ydnvvyr5q44ks566c347vna7igb"; + revision = "2"; + editedCabalFile = "0byn0brmsdzhjiiicqbn0b7zd2rjrkcxk4i62ih7bqsw22xids0f"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -88734,6 +88721,8 @@ self: { pname = "diagrams-lib"; version = "1.4.6.2"; sha256 = "0qz5yrrg4k4f72fg20b1rq5mk7n7q531qmj0irpg9lmrr596bdh9"; + revision = "1"; + editedCabalFile = "03spvjxwlv7sfr5cpkfl2ddxap031jsclg88bas99pckw08amp5g"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -88867,8 +88856,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4.2.3"; sha256 = "0n46scybjs8mnhrnh5z3nkrah6f8v1rv4cca8k8mqzsf8ss30q5l"; - revision = "1"; - editedCabalFile = "1w1jksdpfra1x76r3dz8lkcbg661ccgi0pwag7kgdi9nj62ahmyh"; + revision = "2"; + editedCabalFile = "1v8djd4qndmkl8lc966pkh9gbgb8rkwqg2395xad6i03gqxvl55d"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -89175,8 +89164,8 @@ self: { pname = "dictionary-sharing"; version = "0.1.0.0"; sha256 = "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc"; - revision = "3"; - editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439"; + revision = "4"; + editedCabalFile = "18v6x0pjih851q5d8cdm79bhpdh6wxv9p6z746y7wppmy9j943qy"; libraryHaskellDepends = [ base containers ]; description = "Sharing/memoization of class members"; license = lib.licenses.bsd3; @@ -91043,8 +91032,8 @@ self: { pname = "distributed-process"; version = "0.7.6"; sha256 = "0kfgz8nrg8pdnw56msdkdlc1y894giz6jmgss6gxmhrr929rsnlz"; - revision = "2"; - editedCabalFile = "1l9sq9xfz7wv6grkmlv3wd0i8vbabvl1ldbavcnqr2gna4q36vqi"; + revision = "3"; + editedCabalFile = "0fnanh4yl1z7v8bqlj8q3r0cgbpllv1md9l1hhi73alpn5fmdwc7"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq distributed-static exceptions hashable mtl network-transport random @@ -91871,6 +91860,31 @@ self: { mainProgram = "dl-fedora"; }) {}; + "dl-fedora_1_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory, extra + , filepath, http-client, http-client-tls, http-directory + , http-types, optparse-applicative, regex-posix, simple-cmd + , simple-cmd-args, simple-prompt, text, time, unix, xdg-userdirs + }: + mkDerivation { + pname = "dl-fedora"; + version = "1.1"; + sha256 = "0mc0sdc6l2aq1vzz8lqxq9v88350rsv15xqn0q7mg1n255xbiclh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring directory extra filepath http-client + http-client-tls http-directory http-types optparse-applicative + regex-posix simple-cmd simple-cmd-args simple-prompt text time unix + xdg-userdirs + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Fedora image download tool"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "dl-fedora"; + }) {}; + "dlist" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { @@ -92041,8 +92055,8 @@ self: { }: mkDerivation { pname = "dnf-repo"; - version = "0.6"; - sha256 = "1420jj5kmvj2h3ix8v6hmf4fdkzn1ixbvxg9fi7zfdfll7831gk0"; + version = "0.6.1"; + sha256 = "0zxbxadvsvj2247npbn35k4vblaf681lgsq40r06vbh0bildy490"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -92616,6 +92630,8 @@ self: { pname = "docopt"; version = "0.7.0.8"; sha256 = "0pcixlpa5cwf531aa5nmwvp50gagm2khwl1xsy8hi4jn7ksnk1y8"; + revision = "1"; + editedCabalFile = "13p8gyib0w3hhbqaijbm0jajnc7cp0bnd23wih2apg9a6aalwsnr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers parsec template-haskell @@ -92734,6 +92750,8 @@ self: { pname = "doctest"; version = "0.22.2"; sha256 = "1rf6hbiml8jk5n9j9isqi012chhhzjlp224hqwz7xh8r830kkf5g"; + revision = "1"; + editedCabalFile = "1w9nzs10cyfd5922xkm2crvr2191420qzzpbajxjsgdmkjgk55vd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93138,6 +93156,8 @@ self: { pname = "dom-lt"; version = "0.2.3"; sha256 = "1h73159h61f1wv6kans0nqspfq46wiz77isnjg8vd9m127hqn69x"; + revision = "1"; + editedCabalFile = "140hnm6jg74fmhi6vsq2qq8agf3ar7wakwpxfkdf0zg944p41y8x"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; @@ -95041,8 +95061,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.12.3"; - sha256 = "10262cqc6ynbpvqpa3ijfacwyid4fxqxks6rm68brmqrzdqyh6wk"; + version = "0.13.0"; + sha256 = "1zbdl440xgb9s6nkqxg7fa2pc7m75w0bbndlfks4jqr1jq9f4hfh"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95075,8 +95095,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.12.3"; - sha256 = "0whmsiixv1iid1cd3faz0zib8hv4v09yclq6a7ypz4zyvjyk0szh"; + version = "0.13.0"; + sha256 = "14ckh9bshfjcinj637cmbfq6jx85ga0z98v3sqm66jw84zdqr4sy"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -96998,8 +97018,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.3.0.0"; - sha256 = "03yr8hr1aahqfm04jdn7nnfblvxpj1zgrv8c9ymgjnn6gxjvwhk7"; + version = "2.3.1.0"; + sha256 = "11gwck3ndsxslfcl9s16q0n5pgimwynp9qghxp4maf651w371kh3"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -97021,8 +97041,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.3.0.1"; - sha256 = "16vk5sjyy4knw9yss25iv501zxz2258qds3bhl1mrqa24phy3c9w"; + version = "2.3.1.0"; + sha256 = "0kn1xi7ggwdaixy2sy7ajffrplszhc57m36jmvnsz8plph1rdyim"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -97035,8 +97055,8 @@ self: { ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { pname = "effectful-plugin"; - version = "1.1.0.2"; - sha256 = "1g4ic03aad2sc62jxspcq5zsisqmr03fs39ganzcklh86asmdb8h"; + version = "1.1.0.3"; + sha256 = "07x07h906a9qm1pd4gdk7x5cl4yz3c6xj25q8zadbjwf9smi0lh1"; libraryHaskellDepends = [ base containers effectful-core ghc ]; testHaskellDepends = [ base effectful-core ]; description = "A GHC plugin for improving disambiguation of effects"; @@ -97075,6 +97095,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-th_1_0_0_2" = callPackage + ({ mkDerivation, base, containers, effectful-core, exceptions + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "effectful-th"; + version = "1.0.0.2"; + sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; + libraryHaskellDepends = [ + base containers effectful-core exceptions template-haskell + th-abstraction + ]; + testHaskellDepends = [ base effectful-core ]; + description = "Template Haskell utilities for the effectful library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effective-aspects" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, hashtables, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -98424,29 +98462,6 @@ self: { }: mkDerivation { pname = "elm-street"; - version = "0.2.2.0"; - sha256 = "1wgf5fss6qwgc3q18k5z95658jy4g8gx1v0ys7wwbqix4jhn461s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base directory filepath prettyprinter text time - ]; - executableHaskellDepends = [ - base directory filepath servant servant-server text wai warp - ]; - testHaskellDepends = [ aeson base bytestring hspec ]; - doHaddock = false; - description = "Crossing the road between Haskell and Elm"; - license = lib.licenses.mpl20; - }) {}; - - "elm-street_0_2_2_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, prettyprinter, servant, servant-server, text, time, wai - , warp - }: - mkDerivation { - pname = "elm-street"; version = "0.2.2.1"; sha256 = "0hn3fxpmrwb162r8diijg0dp3rpz241nizdcbclq8friii13c3m4"; isLibrary = true; @@ -98461,7 +98476,6 @@ self: { doHaddock = false; description = "Crossing the road between Haskell and Elm"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "elm-syntax" = callPackage @@ -98556,6 +98570,31 @@ self: { mainProgram = "elm2nix"; }) {}; + "elmental" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hspec + , hspec-golden, kind-generics, kind-generics-th, neat-interpolation + , pretty-show, text + }: + mkDerivation { + pname = "elmental"; + version = "0.1.0.2"; + sha256 = "1asn28nzrns0p3jgkwaghfs9ka4g3qr02ls151gk8h8cm6mnc98m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath kind-generics neat-interpolation + text + ]; + executableHaskellDepends = [ base kind-generics-th text ]; + testHaskellDepends = [ + base containers hspec hspec-golden kind-generics-th pretty-show + text + ]; + description = "Generate Elm datatype definitions, encoders and decoders from Haskell datatypes"; + license = lib.licenses.bsd3; + mainProgram = "generate-test-app-code"; + }) {}; + "elminator" = callPackage ({ mkDerivation, aeson, base, containers, mtl, template-haskell , text @@ -99282,6 +99321,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "emojis_0_1_4_1" = callPackage + ({ mkDerivation, base, containers, HUnit, text }: + mkDerivation { + pname = "emojis"; + version = "0.1.4.1"; + sha256 = "1r8a8xjnsqbyzg96fla2s1cg6804297w6487rnrvjhqxgccxc040"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base HUnit text ]; + description = "Conversion between emoji characters and their names"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "empty" = callPackage ({ mkDerivation }: mkDerivation { @@ -99986,8 +100038,8 @@ self: { pname = "env-guard"; version = "0.2"; sha256 = "0chgskm1893i17b7r704wh44b7wh0ig2jz7y43vznhnmchrc80al"; - revision = "4"; - editedCabalFile = "0fax8g5n9hjaifvf20cszgb513ak9777d816cz50hlwfj114rjds"; + revision = "5"; + editedCabalFile = "0k0q8agfiqykaz5hv9q0g1xxbkkmk8n2pizv1n49kmfn3vg9rf4r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Conditionally running IO actions based on environment variables"; @@ -100118,34 +100170,37 @@ self: { "eo-phi-normalizer" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, base, blaze-html - , blaze-markup, BNFC, Cabal, directory, doctest-parallel - , file-embed, filepath, generic-lens, happy, hspec, hspec-discover - , lens, mtl, optparse-applicative, process, QuickCheck, scientific - , string-interpolate, template-haskell, text, yaml + , blaze-markup, BNFC, bytestring, Cabal, cereal, directory + , doctest-parallel, file-embed, filepath, generic-lens, happy + , hspec, hspec-discover, lens, mtl, optparse-applicative, process + , PyF, QuickCheck, regex-compat, scientific, template-haskell, text + , with-utf8, yaml }: mkDerivation { pname = "eo-phi-normalizer"; - version = "0.3.1"; - sha256 = "0ap9p8ls5k692ldhkpiasnkdq0a33py8kc3i150yjcbqv5falhc3"; + version = "0.4.1"; + sha256 = "1sgag1wpl7nykq5gkkd6iak1f3nm9908cdmqr02fvn4ywrx8j1pa"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal process string-interpolate ]; + setupHaskellDepends = [ base Cabal process PyF ]; libraryHaskellDepends = [ - aeson array base blaze-html blaze-markup directory file-embed - filepath generic-lens lens mtl scientific string-interpolate - template-haskell text yaml + aeson array base blaze-html blaze-markup bytestring cereal + directory file-embed filepath generic-lens lens mtl PyF + regex-compat scientific template-haskell text yaml ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - aeson aeson-pretty array base blaze-html blaze-markup directory - file-embed filepath generic-lens lens mtl optparse-applicative - scientific string-interpolate template-haskell text yaml + aeson aeson-pretty array base blaze-html blaze-markup bytestring + cereal directory file-embed filepath generic-lens lens mtl + optparse-applicative PyF regex-compat scientific template-haskell + text with-utf8 yaml ]; executableToolDepends = [ alex BNFC happy ]; testHaskellDepends = [ - aeson array base blaze-html blaze-markup directory doctest-parallel - file-embed filepath generic-lens hspec hspec-discover lens mtl - QuickCheck scientific string-interpolate template-haskell text yaml + aeson array base blaze-html blaze-markup bytestring cereal + directory doctest-parallel file-embed filepath generic-lens hspec + hspec-discover lens mtl PyF QuickCheck regex-compat scientific + template-haskell text with-utf8 yaml ]; testToolDepends = [ alex BNFC happy hspec-discover ]; description = "Command line normalizer of 𝜑-calculus expressions"; @@ -100423,23 +100478,6 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.7.0.2"; - sha256 = "18pmg7c103yprldbzh0c3wz2mbiidi14ildymsfggnxica6w05qg"; - revision = "1"; - editedCabalFile = "0qqswv42lwkv6y4hssniv4my9l9kxyvh84b2gmyqky1ijcny5y6k"; - libraryHaskellDepends = [ - base containers template-haskell th-desugar void - ]; - description = "Proof assistant for Haskell using DataKinds & PolyKinds"; - license = lib.licenses.bsd3; - }) {}; - - "equational-reasoning_0_7_0_3" = callPackage - ({ mkDerivation, base, containers, template-haskell, th-desugar - , void - }: - mkDerivation { - pname = "equational-reasoning"; version = "0.7.0.3"; sha256 = "0pr7m6afb6yi4g86pk08i27xxs9n4dszxkra6lm3icm72szygw2j"; revision = "1"; @@ -100449,7 +100487,6 @@ self: { ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "equational-reasoning-induction" = callPackage @@ -100544,8 +100581,8 @@ self: { }: mkDerivation { pname = "erebos"; - version = "0.1.3"; - sha256 = "1zlvaf33w1xc6cg6xklws510inh8lnyn5hfmqgl43hs7rhy4qj96"; + version = "0.1.4"; + sha256 = "1qrc5kycmirbwzjajv6rvlj43wnhixqa2z2lbj0hx55l28626vzj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103620,6 +103657,28 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; + "exon_1_7_0_0" = callPackage + ({ mkDerivation, base, criterion, ghc, hedgehog, incipit-base + , parsec, tasty, tasty-hedgehog, template-haskell + }: + mkDerivation { + pname = "exon"; + version = "1.7.0.0"; + sha256 = "1i45lxdp6g94cxcx64jipxdpvza2qpz5m3z2h499xwljgyzyj3vy"; + revision = "1"; + editedCabalFile = "1b7vdc8fdck4rfpg046gakry9kwxwmz9d9zwg8racfpw5qls6y27"; + libraryHaskellDepends = [ + base ghc incipit-base parsec template-haskell + ]; + testHaskellDepends = [ + base hedgehog incipit-base tasty tasty-hedgehog template-haskell + ]; + benchmarkHaskellDepends = [ base criterion incipit-base ]; + description = "Customizable quasiquote interpolation"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + }) {}; + "exotic-list-monads" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , QuickCheck @@ -104418,8 +104477,8 @@ self: { pname = "extensions"; version = "0.1.0.2"; sha256 = "1ra1qfrsc3icv6lgm06pgrhv77shwb8r7ci2whgnj3hs692ld7gd"; - revision = "3"; - editedCabalFile = "0ajnch6ykri1xl091yh48m8hf572d2i1aw34r5z9s9rk6bj7xxi4"; + revision = "4"; + editedCabalFile = "0aw558iz7xf3sd2n36rp3x4vi6w0cv1r4xx0kz8hkv0w1aay0vh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105095,20 +105154,21 @@ self: { "faktory" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base , bytestring, crypton-connection, cryptonite, errors, hspec - , markdown-unlit, megaparsec, memory, mtl, network, random - , safe-exceptions, scanner, semigroups, text, time, unix - , unordered-containers + , markdown-unlit, megaparsec, memory, microlens, mtl, network + , random, resource-pool, safe-exceptions, scanner, semigroups, text + , time, unix, unliftio, unordered-containers }: mkDerivation { pname = "faktory"; - version = "1.1.2.7"; - sha256 = "057rrfrfxa5xsv9pqy3jsx5gzrg0lwcx50w0hlwvkgpzlxnfch30"; + version = "1.1.3.0"; + sha256 = "02csx7s9d6aa41blrlk4c580f5cy3psrsmc2yr86q7pxfb25mh5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring crypton-connection cryptonite - errors megaparsec memory mtl network random safe-exceptions scanner - semigroups text time unix unordered-containers + errors megaparsec memory microlens mtl network random resource-pool + safe-exceptions scanner semigroups text time unix unliftio + unordered-containers ]; executableHaskellDepends = [ aeson base safe-exceptions ]; testHaskellDepends = [ @@ -105184,8 +105244,8 @@ self: { pname = "falsify"; version = "0.2.0"; sha256 = "1fhj70q6kfd98892gxfy3mc8wxxyr80g4rzapaici4zd3zczz2fd"; - revision = "2"; - editedCabalFile = "1cr3lx1i89jb9sx4pqlgnb03gdav28hhn0i7prv63kjyzjn10p82"; + revision = "3"; + editedCabalFile = "0wpdv7xjf2q8wk3zql5y73ly4mky14m9rc4ql4g82x7biabnm7xg"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers data-default mtl optics-core optparse-applicative selective sop-core splitmix @@ -105361,26 +105421,6 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.2"; - sha256 = "1pdg8jc8qalwz0rrbdb0rdgq5d00j8s3bldnbdkgwc6iqagvwnsp"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath stm - text unix-compat unix-time - ]; - testHaskellDepends = [ async base bytestring directory hspec ]; - testToolDepends = [ hspec-discover ]; - description = "A fast logging system"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "fast-logger_3_2_3" = callPackage - ({ mkDerivation, array, async, auto-update, base, bytestring - , directory, easy-file, filepath, hspec, hspec-discover, stm, text - , unix-compat, unix-time - }: - mkDerivation { - pname = "fast-logger"; version = "3.2.3"; sha256 = "0af4228rnv2g3fgw00vx85fh0ngi092bx54awx1cd1jjkmpdyn73"; libraryHaskellDepends = [ @@ -105391,7 +105431,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; @@ -106522,18 +106561,18 @@ self: { "fedora-repoquery" = callPackage ({ mkDerivation, base, bodhi, bytestring, cached-json-file , directory, extra, filepath, http-client, http-directory - , regex-compat, simple-cmd, simple-cmd-args, text, time + , regex-compat, simple-cmd, simple-cmd-args, time }: mkDerivation { pname = "fedora-repoquery"; - version = "0.3.2"; - sha256 = "16qlplbxw3ipxgahvkn40i9mbpsmaprnjf42xmww6hiyp5iliwrv"; + version = "0.4"; + sha256 = "11lxxg7mxy3bx707yl8j3qgk48jsgc16wdndpp7j21c2sjg68skk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bodhi bytestring cached-json-file directory extra filepath http-client http-directory regex-compat simple-cmd simple-cmd-args - text time + time ]; testHaskellDepends = [ base simple-cmd ]; description = "Fedora repoquery tool"; @@ -108112,6 +108151,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "fin_0_3_1" = callPackage + ({ mkDerivation, base, boring, dec, deepseq, hashable + , inspection-testing, QuickCheck, some, tagged, universe-base + }: + mkDerivation { + pname = "fin"; + version = "0.3.1"; + sha256 = "1y98g48dr046d1v300aj10dq5mrn79yj769gcld01834xi0ng010"; + libraryHaskellDepends = [ + base boring dec deepseq hashable QuickCheck some universe-base + ]; + testHaskellDepends = [ base inspection-testing tagged ]; + description = "Nat and Fin: peano naturals and finite numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fin-int" = callPackage ({ mkDerivation, attenuation, base, data-default-class, deepseq , portray, portray-diff, QuickCheck, sint @@ -109299,8 +109355,8 @@ self: { pname = "flac"; version = "0.2.1"; sha256 = "0ca41lyl21x9nrlnj5df4fbhycpsmfrl6fsd8pmza2wklx8zlv9d"; - revision = "1"; - editedCabalFile = "1a2qja90bqm6zwfsi6z22zm74rb3sah37j4qlz4lx08zns92bdir"; + revision = "2"; + editedCabalFile = "1byq496k06whqxdiaa7s3f4hh8mbawm6i0a9pgkbj239y14c3qpj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath mtl text @@ -109613,6 +109669,8 @@ self: { pname = "flay"; version = "0.4"; sha256 = "1vqkjjf2bzmi489wsx23ryyplbg26q9qrzb98dz80j5b5rj3xzq1"; + revision = "1"; + editedCabalFile = "0xidxbyal19npq6j7cr92prm61m6w4mdqd8zvvli54h40xd2kg21"; libraryHaskellDepends = [ base constraints transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck transformers ]; description = "Work generically on your datatype without knowing its shape nor its contents"; @@ -109621,6 +109679,22 @@ self: { broken = true; }) {}; + "flay_0_5" = callPackage + ({ mkDerivation, base, constraints, tasty, tasty-quickcheck + , transformers + }: + mkDerivation { + pname = "flay"; + version = "0.5"; + sha256 = "1kab09h2zxxdl11x1j6cc3qkgpx2x5zwsx76chm4rydxr4j95d4d"; + libraryHaskellDepends = [ base constraints transformers ]; + testHaskellDepends = [ base tasty tasty-quickcheck transformers ]; + description = "Generic programming for higher-kinded types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "flexible-defaults" = callPackage ({ mkDerivation, base, containers, template-haskell, th-extras , transformers @@ -109978,25 +110052,12 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; - version = "2.0.0.4"; - sha256 = "079r6cjs7wz7kxql1m45pazf0nya8xgiil3sbcqrr2csxmam23cr"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Write more understandable Haskell"; - license = lib.licenses.mit; - }) {}; - - "flow_2_0_0_5" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "flow"; version = "2.0.0.5"; sha256 = "1g2fg0mdw0i2c91x3vgdzwhasmk1an5x5w5wy8dpv3hvc2van3jk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "flow-er" = callPackage @@ -111179,8 +111240,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "12"; - editedCabalFile = "0rpr0j150584h4l8mn3ziq4r055w0n24sxai20b3iqhkrd10vmk1"; + revision = "13"; + editedCabalFile = "07p1rlal8fjbyd4hm0p3a3cp3b67a86qdls88yl3f0xcgrnxxmkq"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -111380,8 +111441,8 @@ self: { pname = "forma"; version = "1.2.0"; sha256 = "13kyggzlf156d3d3mj453jwmafyz74vk4bim3f30zxyd6syl3m5v"; - revision = "2"; - editedCabalFile = "1wm2zqhdzx5qawlqm74kpfivfhp3bmlagxc63xz7vm4pr17cisyq"; + revision = "3"; + editedCabalFile = "0lh9dgi3m75078ijvc7s4c1bd1nr1l3v4w81l2455m6gydwsrrkd"; libraryHaskellDepends = [ aeson base containers mtl text ]; testHaskellDepends = [ aeson base containers hspec mtl text ]; description = "Parse and validate forms in JSON format"; @@ -111909,43 +111970,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_11_0_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, Diff, directory, dlist - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, syb, temporary, text - , th-env, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.11.0.0"; - sha256 = "1hs743r2saqzk4sbwqpyw8k62jhlrc914gizcw5yp0r1gpq83idr"; - revision = "2"; - editedCabalFile = "1gjmdwcm10d178bg468xzzg9b0fc4saxi2fhdc771rqaggd1rxg1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base binary bytestring Cabal-syntax - containers Diff directory dlist file-embed filepath ghc-lib-parser - megaparsec MemoTrie mtl syb text yaml - ]; - executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml - ]; - testHaskellDepends = [ - base Cabal-syntax containers Diff directory filepath ghc-lib-parser - hspec hspec-megaparsec path path-io pretty process QuickCheck - temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, deepseq, Diff, directory @@ -111980,35 +112004,33 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_15_0_0" = callPackage + "fourmolu_0_16_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, deepseq, Diff, directory - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, scientific, syb - , temporary, text, th-env, yaml + , bytestring, Cabal-syntax, choice, containers, deepseq, Diff + , directory, file-embed, filepath, ghc-lib-parser, hspec + , hspec-discover, hspec-megaparsec, megaparsec, MemoTrie, mtl + , optparse-applicative, path, path-io, pretty, process, QuickCheck + , scientific, syb, temporary, terminal-size, text, th-env, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.15.0.0"; - sha256 = "11xy0k5zkhd0dz7ify0m466l90j8sblm9rzzwkc0nn0d8pxyizfq"; - revision = "1"; - editedCabalFile = "1a0wnrvygipxivjzjbbvl1vm4pc45p5p239z741xj9jj5kipjh9c"; + version = "0.16.2.0"; + sha256 = "1vbqzljpqgabdcx282mh95q8kdap3pckfxzw03nhhinmh6hv31xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary bytestring Cabal-syntax - containers deepseq Diff directory file-embed filepath - ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + choice containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text ]; executableHaskellDepends = [ base Cabal-syntax containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml + optparse-applicative terminal-size text th-env yaml ]; testHaskellDepends = [ - base bytestring Cabal-syntax containers Diff directory filepath - ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io - pretty process QuickCheck temporary text yaml + base bytestring Cabal-syntax choice containers Diff directory + filepath ghc-lib-parser hspec hspec-megaparsec megaparsec path + path-io pretty process QuickCheck temporary text yaml ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -112025,6 +112047,8 @@ self: { pname = "fp-ieee"; version = "0.1.0.4"; sha256 = "1zba050nwsf2iidxklibndja5kmszc5k7jmimchszrnc821d0cqg"; + revision = "1"; + editedCabalFile = "0bryqkf0h9a102bk7albf4pd1mjgs2l2wa6jc96sqly75ddr4d06"; libraryHaskellDepends = [ base ghc-bignum integer-logarithms ]; testHaskellDepends = [ base doctest hspec hspec-core integer-logarithms QuickCheck random @@ -112394,14 +112418,12 @@ self: { "freckle-app" = callPackage ({ mkDerivation, aeson, annotated-exception, autodocodec - , autodocodec-openapi3, aws-xray-client-persistent - , aws-xray-client-wai, base, bcp47, Blammo, bugsnag, bytestring + , autodocodec-openapi3, base, bcp47, Blammo, bugsnag, bytestring , case-insensitive, cassava, conduit, conduit-extra, containers , cookie, datadog, directory, doctest, dotenv, ekg-core, envparse , errors, exceptions, extra, faktory, filepath, Glob, hashable , hs-opentelemetry-api, hs-opentelemetry-instrumentation-persistent - , hs-opentelemetry-instrumentation-wai - , hs-opentelemetry-propagator-datadog, hs-opentelemetry-sdk, hspec + , hs-opentelemetry-instrumentation-wai, hs-opentelemetry-sdk, hspec , hspec-core, hspec-expectations-json, hspec-expectations-lifted , hspec-junit-formatter, http-client, http-conduit , http-link-header, http-types, hw-kafka-client, immortal, lens @@ -112412,22 +112434,21 @@ self: { , QuickCheck, resource-pool, resourcet, retry, safe, scientist , semigroupoids, serialise, template-haskell, text, time , transformers, transformers-base, typed-process, unliftio - , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml - , yesod-core, yesod-test, zlib + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , yesod-test, zlib }: mkDerivation { pname = "freckle-app"; - version = "1.15.4.0"; - sha256 = "0vrc34946jh37g4mbydwdj40nj6b1mlhrdq3ipn3lbjzvxapmb4d"; - libraryHaskellDepends = [ - aeson annotated-exception autodocodec autodocodec-openapi3 - aws-xray-client-persistent aws-xray-client-wai base bcp47 Blammo - bugsnag bytestring case-insensitive cassava conduit conduit-extra - containers cookie datadog directory doctest dotenv ekg-core - envparse errors exceptions extra faktory filepath Glob hashable - hs-opentelemetry-api hs-opentelemetry-instrumentation-persistent - hs-opentelemetry-instrumentation-wai - hs-opentelemetry-propagator-datadog hs-opentelemetry-sdk hspec + version = "1.18.0.0"; + sha256 = "0djg319wkwrsqf27jnv5cvlbywzr26rm6036mwafn5kz5r0alwda"; + libraryHaskellDepends = [ + aeson annotated-exception autodocodec autodocodec-openapi3 base + bcp47 Blammo bugsnag bytestring case-insensitive cassava conduit + conduit-extra containers cookie datadog directory doctest dotenv + ekg-core envparse errors exceptions extra faktory filepath Glob + hashable hs-opentelemetry-api + hs-opentelemetry-instrumentation-persistent + hs-opentelemetry-instrumentation-wai hs-opentelemetry-sdk hspec hspec-core hspec-expectations-lifted hspec-junit-formatter http-client http-conduit http-link-header http-types hw-kafka-client immortal lens memcache monad-control monad-logger @@ -112436,16 +112457,15 @@ self: { persistent-postgresql postgresql-simple primitive pureMD5 QuickCheck resource-pool resourcet retry safe scientist semigroupoids serialise template-haskell text time transformers - transformers-base typed-process unliftio unliftio-core - unordered-containers vector wai wai-extra yaml yesod-core - yesod-test + transformers-base typed-process unliftio unordered-containers + vector wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ - aeson base Blammo bugsnag bytestring cassava conduit errors hspec - hspec-expectations-json hspec-expectations-lifted http-types lens - lens-aeson memcache monad-validate mtl nonempty-containers - postgresql-simple QuickCheck text time unordered-containers vector - wai wai-extra zlib + aeson base Blammo bugsnag bytestring cassava conduit errors + hs-opentelemetry-api hspec hspec-expectations-json + hspec-expectations-lifted http-types lens lens-aeson memcache + monad-validate mtl nonempty-containers postgresql-simple QuickCheck + text time unordered-containers vector wai wai-extra zlib ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -112599,6 +112619,25 @@ self: { mainProgram = "free-er-examples"; }) {}; + "free-foil" = callPackage + ({ mkDerivation, array, base, bifunctors, containers, deepseq + , doctest-parallel, template-haskell, text + }: + mkDerivation { + pname = "free-foil"; + version = "0.0.3"; + sha256 = "0gafhqwdzz8zqyfiw50w5zkyg5989hzqlcdq2lgqcqpzvhjg9x1r"; + libraryHaskellDepends = [ + array base bifunctors containers deepseq template-haskell text + ]; + testHaskellDepends = [ + array base bifunctors containers deepseq doctest-parallel + template-haskell text + ]; + description = "Efficient Type-Safe Capture-Avoiding Substitution for Free (Scoped Monads)"; + license = lib.licenses.bsd3; + }) {}; + "free-functors" = callPackage ({ mkDerivation, base, bifunctors, comonad, contravariant , derive-lifted-instances, profunctors, template-haskell @@ -113859,21 +113898,20 @@ self: { }) {}; "ftdi" = callPackage - ({ mkDerivation, async, base, base-unicode-symbols, bytestring - , generic-random, QuickCheck, random, tagged, test-framework + ({ mkDerivation, async, base, bytestring, generic-random + , QuickCheck, random, tagged, test-framework , test-framework-quickcheck2, transformers, usb, vector }: mkDerivation { pname = "ftdi"; - version = "0.3.0.2"; - sha256 = "0ybx59gs54nk5swh8c2yzcn7mxsm02qp7rwaj51y38p4yzajcw9x"; + version = "0.3.0.3"; + sha256 = "11xgscqdg1nbfr49b7dxjlzh2w8iw0dzyp4f16jlrajyxvw8fjq5"; libraryHaskellDepends = [ - async base base-unicode-symbols bytestring transformers usb vector + async base bytestring transformers usb vector ]; testHaskellDepends = [ - base base-unicode-symbols bytestring generic-random QuickCheck - random tagged test-framework test-framework-quickcheck2 - transformers usb vector + base bytestring generic-random QuickCheck random tagged + test-framework test-framework-quickcheck2 transformers usb vector ]; description = "A thin layer over USB to communicate with FTDI chips"; license = lib.licenses.bsd3; @@ -114876,6 +114914,8 @@ self: { pname = "fusion-plugin"; version = "0.2.7"; sha256 = "0ly2pyhh5s1ahmgkbmm1rqnz035dmniv23w6m2d0vbgxy5mkbb0i"; + revision = "2"; + editedCabalFile = "1sk3rz7nwqb9608c78izj8ql3k7dsxy02j8alxsgbwb3kisa673l"; libraryHaskellDepends = [ base containers directory filepath fusion-plugin-types ghc syb time transformers @@ -114911,8 +114951,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.16"; - sha256 = "0yvn01d5mvahp26vhqil7m900didh5hqc2gaxa1wjg1bn0lz99ah"; + version = "0.25.17"; + sha256 = "05qmsg901d10v2fibh18jy5f84i8ickx5rfx00akw4kyr7myf9fk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115356,7 +115396,6 @@ self: { ]; description = "FWGL GHCJS backend"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fx" = callPackage @@ -115749,6 +115788,8 @@ self: { pname = "gargoyle"; version = "0.1.2.0"; sha256 = "1jj1pgzikg2zw5zmkjn9kh45as5fh0ifi3kragizbbly8qy60nwl"; + revision = "1"; + editedCabalFile = "0ysxnkhymkfwkfjd7i0ys68qmcfqjm57bswi410rcfz61ania45x"; libraryHaskellDepends = [ base directory filelock filepath network process unix ]; @@ -115765,6 +115806,8 @@ self: { pname = "gargoyle-postgresql"; version = "0.2.0.2"; sha256 = "1l1p51wp8s52bpy6ac1zw1d1x0sk97bi9g77p43610386cq3dlpl"; + revision = "2"; + editedCabalFile = "0g1piy0dmfy3j8q2c6831pml84w3w79df16qm3ibdydagzs6p8xq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115786,8 +115829,8 @@ self: { }: mkDerivation { pname = "gargoyle-postgresql-connect"; - version = "0.1.0.1"; - sha256 = "0ipx0zh8j1k6w71h6zkhdf1xkjhid90q4yiy5mwypyywwwwbwjdv"; + version = "0.1.0.2"; + sha256 = "0dp9zj5fh6w336iykm07q11zfhi3pk9yq9yr2xsp386wjkqs17dq"; libraryHaskellDepends = [ base bytestring directory gargoyle gargoyle-postgresql gargoyle-postgresql-nix postgresql-simple resource-pool @@ -115805,6 +115848,8 @@ self: { pname = "gargoyle-postgresql-nix"; version = "0.3.0.1"; sha256 = "0fspvwgvs2mcg7hlivmjsw92phmxpjzjls23psvnl600nk7pnij8"; + revision = "2"; + editedCabalFile = "1c5f4bkwv4mh2fbfz90rsdiq51c2zzg6nk64byhgvl8ax74iijip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115855,12 +115900,17 @@ self: { }) {}; "gasp" = callPackage - ({ mkDerivation, base, binary, containers, mtl, QuickCheck }: + ({ mkDerivation, adjunctions, base, binary, constraints, containers + , distributive, mtl, QuickCheck + }: mkDerivation { pname = "gasp"; - version = "1.3.0.0"; - sha256 = "0dhna3mj7mdyk1n0x3barpn5g4hkjl9fnbr403xym1dm8rl7r7hg"; - libraryHaskellDepends = [ base binary containers mtl QuickCheck ]; + version = "1.4.0.0"; + sha256 = "17rg4dn163is2c5llwx6575fa5cr4i85rj3nxcylji5qgvmacwws"; + libraryHaskellDepends = [ + adjunctions base binary constraints containers distributive mtl + QuickCheck + ]; description = "A framework of algebraic classes"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -116499,6 +116549,8 @@ self: { pname = "gemini-router"; version = "0.1.2.0"; sha256 = "12b5zvs1npqc47jy04dbs2mqy2n7m0pn83ndz0wb4c1x1qygp7sj"; + revision = "1"; + editedCabalFile = "0wlzl52x65mg3an0phmp6a9d0dbcyv6vvvc941xfrmx2jydq8v78"; libraryHaskellDepends = [ base gemini-server HsOpenSSL network-uri transformers ]; @@ -116515,8 +116567,8 @@ self: { pname = "gemini-server"; version = "0.3.0.0"; sha256 = "0s9h0lzxz5yjvz8rzw9mx9dba21171960waaqikj2qbbja0iq3k3"; - revision = "1"; - editedCabalFile = "151ghd56sa5c95vxb7hacgmykg7y30086w84c61x5y18njnzyqw6"; + revision = "3"; + editedCabalFile = "1lg561xjfsa5q5gayipzr4ggragv2nv80i3bg1psg5n8ryijdpdm"; libraryHaskellDepends = [ base bytestring hslogger HsOpenSSL network network-run network-uri text utf8-string @@ -116536,8 +116588,8 @@ self: { pname = "gemini-textboard"; version = "0.2.0.1"; sha256 = "1yvizcxafq943q9fbz08mq2x50dw9ykdz5vy6hr6ps2g47j4wfa0"; - revision = "1"; - editedCabalFile = "0ppmyz8a03ccdp97s3c1y6zmpvd1whzdjmn30qx8jw6iky8whwjs"; + revision = "2"; + editedCabalFile = "1pl0k7skmf3yp2f8mscmfynhkis6dn6hb94qg26kxyr7jpwbcsb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116918,12 +116970,12 @@ self: { }) {}; "generic-data-functions" = callPackage - ({ mkDerivation, base, contravariant, text }: + ({ mkDerivation, base, contravariant }: mkDerivation { pname = "generic-data-functions"; - version = "0.5.1"; - sha256 = "1yw9v9s9nsz492d6v4sfi0s9nm3mq2kvxn4q9y01s7fwabdijpk1"; - libraryHaskellDepends = [ base contravariant text ]; + version = "0.6.0"; + sha256 = "1d4rl7bb7prpvisx4w4azg5rck1kz9g87svzackjfqjpnx56ma3g"; + libraryHaskellDepends = [ base contravariant ]; description = "Familiar functions lifted to generic data types"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -117094,10 +117146,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-lens-lite"; - version = "0.1"; - sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; - revision = "6"; - editedCabalFile = "0db0lbdq3iqgq42bj6q5qn4az8szwjyhq93f32zmcj1n4mrpxdj9"; + version = "0.1.1"; + sha256 = "1ldc13g7l5jjgca80c2hymkbgq9pf8b5j4x3dr83kz6wq2p76q12"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -117203,10 +117253,8 @@ self: { ({ mkDerivation, base, generic-lens-lite, optics-core }: mkDerivation { pname = "generic-optics-lite"; - version = "0.1"; - sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi"; - revision = "6"; - editedCabalFile = "17yqzcdlm3g5mc8rjjqp98ykj8rj1c46c0vcqk23pwgffpac5d25"; + version = "0.1.1"; + sha256 = "1dd2dw72fyyimnyq8bw57k7lbh0lnjipvk08dyj87h357ykjv3ql"; libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; @@ -119474,8 +119522,8 @@ self: { pname = "ghc-events"; version = "0.19.0.1"; sha256 = "1rliryx527ph1csyq8d5np1g8yfwhmsarspqnl7lp9d9nf0jkbn1"; - revision = "1"; - editedCabalFile = "09arkxfmi64nxr3r7qd0fwikp29qrl4rahf0zwwhhlqrz9n6npzv"; + revision = "2"; + editedCabalFile = "1p41rdbxh23465qqkv6h1sydgxbqwrcyi85xzlyjc2xg0m9ic15s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119659,12 +119707,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_9_0_0" = callPackage + "ghc-exactprint_1_10_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.9.0.0"; - sha256 = "195y3yy7bjrx3b21nqrhxrnbxidaydb9g28i37wqx5glv8y65v51"; + version = "1.10.0.0"; + sha256 = "14jwkx0q2bidcv5ss7zmkvl41z264k7siy9fh7py27h7azb539v0"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -119853,6 +119901,8 @@ self: { pname = "ghc-internal"; version = "9.1001.0"; sha256 = "0z38v4gnyis99r3rli2g3dyg948d98lhd1ylz5irbghnvrn8myhl"; + revision = "1"; + editedCabalFile = "1rx55yc51xaarcyj8mgrdn6pmr8ri2n962h813dy5vc1pj49g8yz"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -120629,13 +120679,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-syntax-highlighter_0_0_11_0" = callPackage + "ghc-syntax-highlighter_0_0_12_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { pname = "ghc-syntax-highlighter"; - version = "0.0.11.0"; - sha256 = "0y2vhw6damddry3prvd5lcs3hak7r9ixv0mf1wvx8g276gs9frxs"; + version = "0.0.12.0"; + sha256 = "0q3lql4ykfha4p5s5dxgf2p9jrim1g14wl0yh6l80y28ls94b7d9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base ghc-lib-parser text ]; testHaskellDepends = [ base hspec text ]; @@ -120722,8 +120772,8 @@ self: { }: mkDerivation { pname = "ghc-tags"; - version = "1.8"; - sha256 = "0gljssyq1ahgl65vnqqa5s1vglzdisx8wp5p2hwh09diwa2ms9mw"; + version = "1.9"; + sha256 = "0s0gipypdz9d7ny8bz38msqlr88y5b3fcd3xzdcsm5mlbra4m904"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -120804,8 +120854,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.4.5"; - sha256 = "1hqhmsa2nic6lpq2d778ksi3ffy865fn72cs2f8d0dxf1di32s0b"; + version = "0.4.6"; + sha256 = "1a8zf8zbknsllmwsgid8q3p669r72iy3g4i89ngyv0hvanghdz2v"; libraryHaskellDepends = [ base ghc ]; description = "Utilities for writing GHC type-checker plugins"; license = lib.licenses.bsd2; @@ -120847,39 +120897,28 @@ self: { ({ mkDerivation, base, bytestring, tasty-bench, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.1.2.8"; - sha256 = "1qmfywqjwbnmhjs2q2nndvdfhigjhq5ma86s882ffcz3rawxv5wi"; - libraryHaskellDepends = [ base bytestring text ]; - benchmarkHaskellDepends = [ base bytestring tasty-bench ]; - description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-trace-events_0_1_2_9" = callPackage - ({ mkDerivation, base, bytestring, tasty-bench, text }: - mkDerivation { - pname = "ghc-trace-events"; version = "0.1.2.9"; sha256 = "01fk87z47jf8hm7dahjnfdmg2m26gi00f64va0p8l6rnirzxz9z9"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring tasty-bench ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-extra" = callPackage ({ mkDerivation, base, containers, ghc, ghc-bignum, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, tasty, tasty-hunit, transformers + , ghc-typelits-natnormalise, tasty, tasty-hunit, template-haskell + , transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.4.6"; - sha256 = "1f4n3s6cjxz3q04ixwi4mvxqb23vpifjlrfnzh4zif0kcf47sp70"; + version = "0.4.7"; + sha256 = "0kacdhzqv7x7f44icxfd54cbad05d9pg8bdsziy657y5m8awnf13"; libraryHaskellDepends = [ base containers ghc ghc-bignum ghc-prim ghc-tcplugins-extra - ghc-typelits-knownnat ghc-typelits-natnormalise transformers + ghc-typelits-knownnat ghc-typelits-natnormalise template-haskell + transformers ]; testHaskellDepends = [ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty @@ -120896,8 +120935,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.7.10"; - sha256 = "03rg0p1grmxxzr9w0bgczavnqhvg2jivq8cafqsvqrsrmiacip8d"; + version = "0.7.12"; + sha256 = "0r2jaqa1667maskpvyx10nr33xypabp1navfh7f0rb2fmxxl3j9z"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -120916,10 +120955,11 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.9"; - sha256 = "1fn7ia00hrhi54m5bzzl0bb49lr6jbjr8crmasbh7ndplfv8zq46"; + version = "0.7.10"; + sha256 = "04q47qdlgry0as8fb441g1dhk8712nhjcmkkgvr4440grr14f4vv"; libraryHaskellDepends = [ - base containers ghc ghc-bignum ghc-tcplugins-extra transformers + base containers ghc ghc-bignum ghc-tcplugins-extra template-haskell + transformers ]; testHaskellDepends = [ base ghc-prim tasty tasty-hunit template-haskell @@ -120936,8 +120976,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.7.3.0"; - sha256 = "146xlp596ymsz1wrx2am62fy1v1gq7v6qzbx6qmj5dgxph0h4w6x"; + version = "0.7.4.0"; + sha256 = "1kas8w67hnrcqrywnqc1w0ls4varj5357nfirdr2r2f12zar6q45"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121205,20 +121245,19 @@ self: { , cryptohash-sha1, data-default, deepseq, dependent-map , dependent-sum, Diff, directory, dlist, enummapset, exceptions , extra, filepath, fingertree, focus, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-paths, ghc-trace-events, gitrev, Glob - , haddock-library, hashable, hie-bios, hie-compat, hiedb, hls-graph - , hls-plugin-api, implicit-hie, lens, list-t, lsp, lsp-test - , lsp-types, mtl, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, random, regex-tdfa - , row-types, safe-exceptions, sorted-list, sqlite-simple, stm - , stm-containers, syb, tasty-hunit, text, text-rope, time - , transformers, unix, unliftio, unliftio-core, unordered-containers - , vector + , ghc-trace-events, gitrev, Glob, haddock-library, hashable + , hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , implicit-hie, lens, list-t, lsp, lsp-types, mtl, opentelemetry + , optparse-applicative, parallel, prettyprinter + , prettyprinter-ansi-terminal, random, regex-tdfa, safe-exceptions + , sorted-list, sqlite-simple, stm, stm-containers, syb, text + , text-rope, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, vector }: mkDerivation { pname = "ghcide"; - version = "2.8.0.0"; - sha256 = "1mjqbh7dmgx9q90pqs6qyqy0mgxj9vcwn5ww6hqcw9i2p847mvgy"; + version = "2.9.0.0"; + sha256 = "18g70rjpkrvc433y2fd2wd6fgcwvxj1gy12h1ajr1dn28ys4847k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121226,20 +121265,18 @@ self: { case-insensitive co-log-core containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory dlist enummapset exceptions extra filepath fingertree focus ghc - ghc-boot ghc-boot-th ghc-check ghc-paths ghc-trace-events Glob - haddock-library hashable hie-bios hie-compat hiedb hls-graph - hls-plugin-api implicit-hie lens list-t lsp lsp-test lsp-types mtl - opentelemetry optparse-applicative parallel prettyprinter - prettyprinter-ansi-terminal random regex-tdfa row-types - safe-exceptions sorted-list sqlite-simple stm stm-containers syb - tasty-hunit text text-rope time transformers unix unliftio + ghc-boot ghc-boot-th ghc-trace-events Glob haddock-library hashable + hie-bios hie-compat hiedb hls-graph hls-plugin-api implicit-hie + lens list-t lsp lsp-types mtl opentelemetry optparse-applicative + parallel prettyprinter prettyprinter-ansi-terminal random + regex-tdfa safe-exceptions sorted-list sqlite-simple stm + stm-containers syb text text-rope time transformers unix unliftio unliftio-core unordered-containers vector ]; executableHaskellDepends = [ base data-default extra gitrev hls-plugin-api lsp lsp-types optparse-applicative ]; - doHaddock = false; description = "The core of an IDE"; license = lib.licenses.asl20; }) {}; @@ -121338,8 +121375,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-base"; - version = "0.8.0.1"; - sha256 = "1cx9jqpbr6b30qckp2zpsfk3swa58snjb79pq0l6485nvrxa9mls"; + version = "0.8.0.2"; + sha256 = "1p78m70jr1bc7c9xh316ib8ldpsk4nzjjz56sax5ygwz4513kc87"; description = "base library for GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -121383,8 +121420,10 @@ self: { }: mkDerivation { pname = "ghcjs-dom"; - version = "0.9.9.1"; - sha256 = "0fjf0l1yaml24ipdxc72fscn1f8az663yx31rwxhq6kj2p7j1jg1"; + version = "0.9.9.2"; + sha256 = "05risvf43x3rvh4ln1mi0jhkf13dpl3j2sxdn8ph5lidiwm0brf2"; + revision = "1"; + editedCabalFile = "11cvqicf9jmcmxc37i8l6vgh1vb501y2xhlqhwhcfinhj07ffs8i"; libraryHaskellDepends = [ base containers ghcjs-dom-jsaddle text transformers ]; @@ -121419,8 +121458,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-javascript"; - version = "0.9.9.1"; - sha256 = "0im7wn7bn43rhkblh0wn9angadbdvywsalfz0adr9pkwv6hvc8qs"; + version = "0.9.9.2"; + sha256 = "19011y6rnaa6mcch64gxpi1gzv6yp8ma2nxi6k6wp6myyfia57wh"; description = "DOM library using JSFFI and GHCJS"; license = lib.licenses.mit; platforms = [ "javascript-ghcjs" ]; @@ -121764,8 +121803,8 @@ self: { }: mkDerivation { pname = "gi-adwaita"; - version = "1.0.6"; - sha256 = "0d5qswxbr8hl0mykjifgxivcbv55viva0gfw5zmgmswkp7my56q2"; + version = "1.0.7"; + sha256 = "16hqnb3a92b10svghgic65grs14mjx0idx2nc8d9lz4y41z27kbz"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -121800,6 +121839,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_28" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.28"; + sha256 = "0dkzchgsbb7f4b4p56ni4s1vmpp7ln722djcbcp5zazqbd0s9vfd"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + description = "Atk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-ayatana-appindicator3" = callPackage ({ mkDerivation, ayatana-appindicator3, base, bytestring, Cabal , containers, gi-gdk, gi-gobject, gi-gtk, haskell-gi @@ -121807,8 +121866,8 @@ self: { }: mkDerivation { pname = "gi-ayatana-appindicator3"; - version = "0.1.0"; - sha256 = "0ds1d21r2fhc92iznc02gnm6xfgj6hx63iz04bvvpbld6s6xislr"; + version = "0.1.1"; + sha256 = "1n6lf59l63yjj0q4q4gxnq3b6s8myxyqyhgpdjkszvpbym6mdb98"; setupHaskellDepends = [ base Cabal gi-gdk gi-gobject gi-gtk haskell-gi ]; @@ -121846,6 +121905,30 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_30" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.30"; + sha256 = "0s0ych0fxnfaqg2q2ndfp2zj01sya0j888snd2rdbaiikxy0kvsq"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Cairo bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage ({ mkDerivation, base, cairo-core, haskell-gi-base , template-haskell @@ -121904,8 +121987,8 @@ self: { }: mkDerivation { pname = "gi-clutter"; - version = "1.0.5"; - sha256 = "05yavg91cfm3da3b9gf9c5yis6c6jv1zcqa6y0wdyyghlzagyix7"; + version = "1.0.6"; + sha256 = "01q4549k57xv5vin82mcysmm9gwar0a2ak0c180ndkqcddkpkq22"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-cogl gi-gio gi-glib gi-gobject gi-json gi-pango haskell-gi @@ -121929,8 +122012,8 @@ self: { }: mkDerivation { pname = "gi-cogl"; - version = "1.0.5"; - sha256 = "04ji6w2xvy6pcbqgnqm1f2wsyv1za1m7b8wyg9vnbdf4hiwl8mzl"; + version = "1.0.6"; + sha256 = "0mq6g6x1znc9b3kjkzcchmc7lr7vf77s49gwi67h3r3nqm90c5c9"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -121948,8 +122031,8 @@ self: { }: mkDerivation { pname = "gi-coglpango"; - version = "1.0.5"; - sha256 = "0zbp7s1kn5xds521wmgxmqiahccbdz0sc54rgmprs8ak2bf3d68p"; + version = "1.0.6"; + sha256 = "1hafha7qbzsq9jh8by730c0lcspdr5wwj4a4w3sg9bbm2290nb4i"; setupHaskellDepends = [ base Cabal gi-cogl gi-glib gi-gobject gi-pango gi-pangocairo haskell-gi @@ -121966,6 +122049,30 @@ self: { broken = true; }) {cogl-pango = null;}; + "gi-dazzle" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango + , haskell-gi, haskell-gi-base, haskell-gi-overloading, libdazzle + , text, transformers + }: + mkDerivation { + pname = "gi-dazzle"; + version = "1.0.2"; + sha256 = "0q2062bld81mq33b32hn2hx644sb4si36n2phs0s8xddijzxiag6"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdazzle ]; + description = "libdazzle bindings"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) libdazzle;}; + "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -121986,6 +122093,27 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenu_0_4_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenu"; + version = "0.4.14"; + sha256 = "16pkj1sdkv5567yvbbgyfwncjs1k9wcj97n61mxk2aaqn5zasp2x"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdbusmenu ]; + description = "Dbusmenu bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk @@ -122011,6 +122139,32 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-dbusmenugtk3_0_4_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk + , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu-gtk3, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenugtk3"; + version = "0.4.15"; + sha256 = "05i72iqv7x9r673d4b4q523q8py0652s79radclqg5maiy40ivfb"; + setupHaskellDepends = [ + base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib + gi-gobject gi-gtk haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf + gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; + description = "DbusmenuGtk bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-freetype2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, freetype , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122030,6 +122184,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) freetype;}; + "gi-freetype2_2_0_5" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, freetype + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-freetype2"; + version = "2.0.5"; + sha256 = "115yjlhb507wp21hcngygr0mrq4vdpnbx24gyfd5wwba9ny38a9j"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ freetype ]; + description = "freetype2 bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) freetype;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -122054,7 +122228,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdk_4_0_7" = callPackage + "gi-gdk_4_0_8" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122062,8 +122236,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "4.0.7"; - sha256 = "1ll3rl6ypcbgnfh3xxfwfswqpmbxgmk628lkkj5h8f9is2fwl067"; + version = "4.0.8"; + sha256 = "1izl25parszwm9nayn0w9zvmic9bsfcfl1jiasnj11pmzzllyryc"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -122100,6 +122274,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkpixbuf_2_0_32" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf + , gi-gio, gi-glib, gi-gmodule, gi-gobject, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.32"; + sha256 = "1yxsrhxv5ndj60bv6djnhbmyh3a6ahmdkyfw5xbr3wy8hh9vc7l3"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gmodule gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gmodule gi-gobject + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk-pixbuf ]; + description = "GdkPixbuf bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkx11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi @@ -122122,15 +122318,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdkx11_4_0_7" = callPackage + "gi-gdkx11_4_0_8" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "4.0.7"; - sha256 = "0hym8rfa9ynihgvvk83npdd29vsbfajnsn824ybighczg73491dh"; + version = "4.0.8"; + sha256 = "0sfgym80d10nn4p91595xa89fnxvzhm1a1abdv89yw5dq4y5hih8"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -122153,8 +122349,8 @@ self: { }: mkDerivation { pname = "gi-ges"; - version = "1.0.4"; - sha256 = "1g3kc51g1imln821scx19plankk01af1c82mvyxjz09bfvc8mwv9"; + version = "1.0.5"; + sha256 = "0hmbpmwda8ijmfmgjxy9s6fvn3akz08lrzh082nv39bsba2wbgj8"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject gi-gst gi-gstpbutils gi-gstvideo haskell-gi @@ -122177,8 +122373,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.14"; - sha256 = "0zn41wapf9iq9fiyifvd0d9ykylcxfl583whadvbwd750knq9j97"; + version = "1.0.15"; + sha256 = "02xibi58zh56j3ji9pkm0nhyc4z4jvlvkpfhaqz6dymp9b4g139p"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122213,6 +122409,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_34" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.34"; + sha256 = "0y01d4758lx6qchwgvqzjwgj00r3fqwpwxjm80wq7gdh0nnwwaz3"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "Gio bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gio-hs-list-model" = callPackage ({ mkDerivation, base, containers, gi-gio, gi-gobject , haskell-gi-base @@ -122237,8 +122453,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.28"; - sha256 = "1bgpl4mmlvq7xa3ar94wx4n1vlcj93s3q772ixp73zmy8izngnci"; + version = "1.0.29"; + sha256 = "19p3zpfpcj3z9d97jpkkr8n5wj1yhp9gry0rwp5csqdvz5h3n5i8"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122268,6 +122484,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_30" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.30"; + sha256 = "1l9lh3rkf4z6mw16g3ghrzsipbn4iv7jrqwcnv0mg12sa5y4slbp"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GLib bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gmodule" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122287,6 +122523,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gmodule_2_0_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gmodule"; + version = "2.0.6"; + sha256 = "1q4a71fimdgrdfzpxf63fkjya2n624b2kyadrcpn17518hhagk7l"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GModule bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -122306,6 +122562,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_31" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.31"; + sha256 = "1vhdbvcr33gi2cvf31q1zbgkd0gpgcrwnqi59ylrsw6xmblndhdh"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene, haskell-gi, haskell-gi-base @@ -122325,6 +122601,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) graphene;}; + "gi-graphene_1_0_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, graphene, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-graphene"; + version = "1.0.8"; + sha256 = "189fsk72m3v7qbwyn75vradvi3y9vrbjlg95dbr65k2mm1if2n9k"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ graphene ]; + description = "Graphene bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) graphene;}; + "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-graphene, gi-pango @@ -122333,8 +122629,8 @@ self: { }: mkDerivation { pname = "gi-gsk"; - version = "4.0.7"; - sha256 = "1mqfhgg1gp33aw3vyg9bpkl7b57apgrv6r3pdwjr2fysmjmi58cl"; + version = "4.0.8"; + sha256 = "0akmlbjapiqnn4lfh4z5b95w8ck2jlrp7abqahaxdcbj3d2kcpb4"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-graphene gi-pango haskell-gi @@ -122356,8 +122652,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.29"; - sha256 = "1cfyrvkgdhdpgmpxl5dg9s5slz3pqbg9gb9dp1alzjjf8n1fg39h"; + version = "1.0.30"; + sha256 = "07nkn14qsfjgv6ks2aac9zpvn6h81xk42bd2h8k6f0cv4hwjwb7k"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122375,8 +122671,8 @@ self: { }: mkDerivation { pname = "gi-gstapp"; - version = "1.0.28"; - sha256 = "1vm95fih31bn4d86rfqnp39xdiq0n4gwzc0j9dv71cdkz6fzswmb"; + version = "1.0.29"; + sha256 = "1yyvakxwd38201w2bb4in5c9y1dc03ss7a0q13wb0dzlfq0dpmal"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122398,8 +122694,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.27"; - sha256 = "0d094gzgb13dsfshwib648szq66ylw86sw0sir03q17pf4c3bjia"; + version = "1.0.28"; + sha256 = "0ximxmlm7zy8n4h7wfx0vvicvq9gfx5567dk36n3xbql2al3q426"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122419,8 +122715,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.28"; - sha256 = "0m55wv5696kqyvirm00ns0wkh2sxw06xrik54j0gg393nxn8s458"; + version = "1.0.29"; + sha256 = "00ppi41zs5acl7rxd48clzvyg3g22biwphyg4s5gw35jyr5fyplr"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst haskell-gi ]; @@ -122441,8 +122737,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.27"; - sha256 = "15vw2x296jmcmby4r9mx065ikqimy20ac0ilwbj7xdx75kmjxxic"; + version = "1.0.28"; + sha256 = "1ibcpyax0l408f4vn119b3jvkvgz6wzj6xcg0dyl60pjjh1bg2r3"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag gi-gstvideo haskell-gi @@ -122465,8 +122761,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.27"; - sha256 = "09mzk3q1ci4mr3bm88y9bkp7q4v3hf575d84hr579l40i1q2mkb4"; + version = "1.0.28"; + sha256 = "1rf97va4rrlkziivsmbrpgkl0049i123fizb4iz3s5863z2vpp9q"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122488,8 +122784,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.28"; - sha256 = "05pm8iyv0dxj031079w3aaws7yi560kz0iyry1pz2qsih9ps0igr"; + version = "1.0.29"; + sha256 = "07g38fn00i1z7fnzb276z892q2rig4wbw9m3x1q5dg5fc0yr2s5r"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -122526,7 +122822,7 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_8" = callPackage + "gi-gtk_4_0_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -122534,8 +122830,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.8"; - sha256 = "1gqyvd2d60xdbgia065dmg7sswfc20b6h97zxq7s6f7r6lphzg2r"; + version = "4.0.9"; + sha256 = "0pccbinm41shskr9l20m42mdvn2v11nylpwq2r4yz30lkpw401if"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -122623,8 +122919,8 @@ self: { }: mkDerivation { pname = "gi-gtk-layer-shell"; - version = "0.1.5"; - sha256 = "10bsb2njsfzgp7qail359hab7kza1qn2lnhdwnj7mbahacx024jq"; + version = "0.1.6"; + sha256 = "164k9r4k5fgkgahwvfyq6p1l566w31ijc1i1h95r549pkm21fi2c"; setupHaskellDepends = [ base Cabal gi-gdk gi-gtk haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdk gi-gtk haskell-gi haskell-gi-base @@ -122710,7 +123006,7 @@ self: { broken = true; }) {inherit (pkgs) gtksourceview3;}; - "gi-gtksource_5_0_0" = callPackage + "gi-gtksource_5_0_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-pango, gtksourceview, haskell-gi, haskell-gi-base @@ -122718,8 +123014,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "5.0.0"; - sha256 = "0yfwms2qzb994q8c48nnm0gfxz315jk0yvd45ss3p1j5idq4b5pp"; + version = "5.0.1"; + sha256 = "0s5xc3d7i2a4ysa2m5kd9qsr2g78yiqj4rfjy06n0kqsmymprvj2"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -122744,8 +123040,8 @@ self: { }: mkDerivation { pname = "gi-handy"; - version = "1.0.4"; - sha256 = "0hahypvzd1h6fvlb2dh5p9wjgsmwi3j6zsn5l699d0w00yf8s5i5"; + version = "1.0.5"; + sha256 = "1a3x7w3142bj12qvfi51697ralnaqdxrlxbkjjcmhfvvdv5c4brz"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -122781,6 +123077,28 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) harfbuzz;}; + "gi-harfbuzz_0_0_10" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-freetype2 + , gi-glib, gi-gobject, harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-harfbuzz"; + version = "0.0.10"; + sha256 = "1b7mmva40a3j1qm2155sy106wwrklj2p5fjwdzlkma8bnr6r2mqx"; + setupHaskellDepends = [ + base Cabal gi-freetype2 gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-freetype2 gi-glib gi-gobject + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ harfbuzz ]; + description = "HarfBuzz bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) harfbuzz;}; + "gi-ibus" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -122788,8 +123106,8 @@ self: { }: mkDerivation { pname = "gi-ibus"; - version = "1.5.7"; - sha256 = "08rd0kkkxaixi9z0ll5k94yinfflmzlwba8f9cizn0y4gqjpcqks"; + version = "1.5.8"; + sha256 = "1fp5ngdp4b4fl98qrpi9wqyndaqxca6pxqg5by6zqvz8rf43jcqd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122825,15 +123143,15 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) webkitgtk;}; - "gi-javascriptcore_6_0_3" = callPackage + "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , javascriptcoregtk, text, transformers }: mkDerivation { pname = "gi-javascriptcore"; - version = "6.0.3"; - sha256 = "09pycpf8h7zzwl0ml7zkgv15v0ia37c067f21zwzbmmqir8fnhwx"; + version = "6.0.4"; + sha256 = "095my50hg37g92f77336z56zc4axgf70fwqvabs0rysp39f1qnk0"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -122853,8 +123171,8 @@ self: { }: mkDerivation { pname = "gi-json"; - version = "1.0.5"; - sha256 = "0iqv6w7af40hlr4bf8qqm2wd5ppd94978ak0mqxx5h132sn8w5kg"; + version = "1.0.6"; + sha256 = "1n212yyv1yz0l90w9as6pq6xjqxnjdg08ns8l274m3ddrpcdjhny"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122867,6 +123185,27 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) json-glib;}; + "gi-keybinder" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, keybinder, text, transformers + }: + mkDerivation { + pname = "gi-keybinder"; + version = "0.3.3"; + sha256 = "0cl0j6w75kqs50vrbf62v3vqrzylf4w2w5b6n381ic25xjv13f5p"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ keybinder ]; + description = "Libkeybinder bindings"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) keybinder;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -122874,8 +123213,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.27"; - sha256 = "02x4qqs0cbw04v1bbidq0pv8pn7qclg0ybi8c0rcvvsyrld8rml4"; + version = "0.7.28"; + sha256 = "1sph16xhvyyfp81b2njz99crzwqas8njn6h0ma7hbi068jmnj7nq"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi ]; @@ -122895,8 +123234,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.18"; - sha256 = "0zkj48sarz1nddq18pc9k1v45cq3sgvr93yh677szrbp797qchis"; + version = "1.0.19"; + sha256 = "0gy3m1s0q70ny1xiqa4jqv4svxhg454bhx04z29vrpc2921b2kkd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122935,6 +123274,32 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pango_1_0_30" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers, gi-gio + , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.30"; + sha256 = "1kp3jnnjik1caiax3j548aypn77qzi1l8r9b2zki95s2yg5rpv9p"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject gi-harfbuzz haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject gi-harfbuzz + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${lib.getDev cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Pango bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-gio, gi-glib, gi-gobject, gi-pango, haskell-gi @@ -122943,8 +123308,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.30"; - sha256 = "1sr42xj76485hjf4xzsf6kf01bbydg4b4ba4pzmn6x2wl4q739lx"; + version = "1.0.31"; + sha256 = "1kns0ywh540rwvmvw1wq3afmzlfygi59pn1zq2km693qv992vz1x"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject gi-pango haskell-gi ]; @@ -122969,8 +123334,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.29"; - sha256 = "0lznz54jkln93p43vv7n67kq2ldjky7g8ig8na4nq9nj3q8fwmj1"; + version = "0.18.30"; + sha256 = "1amw3kzyicw6c6z9gy6via54kigrgx09ivvzf0niccbvjgp7db9q"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -122991,8 +123356,8 @@ self: { }: mkDerivation { pname = "gi-rsvg"; - version = "2.0.5"; - sha256 = "1w4mliz1fna8cb1qf8ivbjmbrcqlnd4wq8ncsjkhiz8ncpxxwaqj"; + version = "2.0.6"; + sha256 = "0v0184nd1q0hy8r0gvkfngrp2h512g9qglzw2van9lds6xzpwzy6"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject haskell-gi @@ -123014,8 +123379,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.17"; - sha256 = "1s5nv3q6b91fipzxmri4gc8pss9dwwm7svv26km7b99w4bd3k4qf"; + version = "0.0.18"; + sha256 = "0z4knqmhcicqnmamzibl1xwarjl7y1da0127jg7s1n7a780dgnd5"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -123049,15 +123414,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsoup;}; - "gi-soup_3_0_2" = callPackage + "gi-soup_3_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libsoup, text, transformers }: mkDerivation { pname = "gi-soup"; - version = "3.0.2"; - sha256 = "07mwdvbw634fp3x1b7xc6ndh96w4ydx14habpy9gysk0a728sskz"; + version = "3.0.3"; + sha256 = "154iw6689b9vhh9y82r3vc86lnvvzy1rvzadzsrp23c043gibg17"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -123078,8 +123443,8 @@ self: { }: mkDerivation { pname = "gi-vips"; - version = "8.0.4"; - sha256 = "0wsa81n9mpcx2yr536jaw9wnnhk3fy22z1fb3dy3d5fsl7164bdq"; + version = "8.0.5"; + sha256 = "07747sr630461d2k44yf2ns7jr6f02c5y7gjg69wcmw7g03gjhfw"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -123115,6 +123480,32 @@ self: { badPlatforms = lib.platforms.darwin; }) {vte_291 = pkgs.vte;}; + "gi-vte_2_91_33" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers, vte_291 + }: + mkDerivation { + pname = "gi-vte"; + version = "2.91.33"; + sha256 = "0w24xl9i0mfw9jvihi8kbmz65s5g81f33l9sa2hk8cvm0w7s3x8p"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-pango haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ vte_291 ]; + description = "Vte bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {vte_291 = pkgs.vte;}; + "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk @@ -123123,8 +123514,8 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "6.0.2"; - sha256 = "00js1737ck6qyz1lkizif84qyqwq7638wdgznrdn6g4yw2a4hd4k"; + version = "6.0.3"; + sha256 = "00nzd9qzbiwrv2511z0cv4wka3haxfxry89i068qh9g08ly7jzca"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123165,6 +123556,32 @@ self: { badPlatforms = lib.platforms.darwin; }) {inherit (pkgs) webkitgtk;}; + "gi-webkit2_4_0_31" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk + , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers, webkitgtk + }: + mkDerivation { + pname = "gi-webkit2"; + version = "4.0.31"; + sha256 = "1zfnhw3qly3jv3xlmrqnqxdxpr376hh8g66px1wfp9dpf4rb5kfm"; + setupHaskellDepends = [ + base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk + gi-javascriptcore gi-soup haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib + gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + description = "WebKit2 bindings"; + license = lib.licenses.lgpl21Only; + badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) webkitgtk;}; + "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup @@ -123173,8 +123590,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.30"; - sha256 = "027jmj0igs5dh7mdap033jxnzpwk6rsp9rhx6y52kjxgcnf97r5x"; + version = "4.0.31"; + sha256 = "0bs0fdphpncsmqpqm369ldqw3k2bhnyizblbjjb73rkcpphvimjh"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123200,8 +123617,8 @@ self: { }: mkDerivation { pname = "gi-webkitwebprocessextension"; - version = "6.0.2"; - sha256 = "0xvryk8kln1c0ka6jncfixm2ycbpnlayx6c8s5pbbcwrnhsj1afz"; + version = "6.0.3"; + sha256 = "0zmpv5vq8nnvcrb46jqq5xnrcw7rqwkh09rgzf7dhfnn6qngify4"; setupHaskellDepends = [ base Cabal gi-gdk gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -123226,8 +123643,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.14"; - sha256 = "13jwqssb3rmaliph73gc9c69wp2sm3k5flxbaj7ld61zzgzm4p0b"; + version = "3.0.15"; + sha256 = "0p0rb9xr6jz68pnir0qj6ci5sbkq1lysgv5zr3jzvjisw56fvqay"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi @@ -123262,6 +123679,26 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs.xorg) libX11;}; + "gi-xlib_2_0_14" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, libX11, text + , transformers + }: + mkDerivation { + pname = "gi-xlib"; + version = "2.0.14"; + sha256 = "0xzxvf88qgglmjakqsn01gi9z84mg6qw4dx16wi931zjibfmmhlg"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libX11 ]; + description = "xlib bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.xorg) libX11;}; + "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , directory, extra, filemanip, filepath, mtl, process, semigroups @@ -123615,8 +124052,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20240430"; - sha256 = "1p32fccxgk6nkp187cazc8cs0fmb92l7v0bdqipihj9wpw8xr4s0"; + version = "10.20240531"; + sha256 = "0fbjxvi72lhk0hwdqwwnhdwi94bff7pn4fzyclmhq55860p8ssna"; configureFlags = [ "-fassistant" "-f-benchmark" "-fcrypton" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fpairing" "-fproduction" "-ftorrentparser" @@ -124150,8 +124587,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "4"; - editedCabalFile = "0lk7dhwgcgjxrryvag1qwnpb6ds5cmrcwj755n5f60nz4hm0hvqs"; + revision = "5"; + editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -124248,30 +124685,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "2.0.0.10"; - sha256 = "1zsp4zab202jh11aaxpg6a59dh4paaqagi446qnwd2f503430zsc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - description = "Upload files to GitHub releases"; - license = lib.licenses.mit; - mainProgram = "github-release"; - }) {}; - - "github-release_2_0_0_11" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; version = "2.0.0.11"; sha256 = "04zgg55zp5ggrisc5nkz4fjmx50cdgjayffcrf7y8gsi6wk96f81"; isLibrary = true; @@ -124283,7 +124696,6 @@ self: { executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "github-release"; }) {}; @@ -124311,6 +124723,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "github-rest_1_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, crypton + , http-client, http-client-tls, http-types, jose-jwt, mtl + , scientific, tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , text, time, transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "github-rest"; + version = "1.2.1"; + sha256 = "1d7jiidqaz1z07gdn6gka8cmp8jdn0v21ppbivxc8718vj5pq5xf"; + libraryHaskellDepends = [ + aeson base bytestring crypton http-client http-client-tls + http-types jose-jwt mtl scientific text time transformers unliftio + unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring crypton http-types mtl tasty + tasty-golden tasty-hunit tasty-quickcheck text + ]; + description = "Query the GitHub REST API programmatically"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, containers, cryptohash, Diff, directory @@ -126016,22 +126452,21 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome-keyring - , libgnome-keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, libgnome-keyring + , text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1.1"; sha256 = "044bbgy8cssi1jc8wwb0kvxpw6d7pwxackkzvw7p9r8ybmgv4d0b"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome-keyring ]; + librarySystemDepends = [ libgnome-keyring ]; libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs.gnome) gnome-keyring; - inherit (pkgs) libgnome-keyring;}; + }) {inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome-vfs @@ -130960,6 +131395,31 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "grfn" = callPackage + ({ mkDerivation, arithmoi, async, base, hspec, hspec-core + , monad-loops, parallel, parallel-io, primes, protolude, QuickCheck + , random, tasty, tasty-bench, text, time, unamb + }: + mkDerivation { + pname = "grfn"; + version = "1.0.0.1"; + sha256 = "1g9f2i50ap1bdcih2r1n6y32pqiv0i8cyw3zzmzvv61q97xrfwjb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + arithmoi async base monad-loops parallel parallel-io protolude + random text unamb + ]; + executableHaskellDepends = [ base time ]; + testHaskellDepends = [ + base hspec hspec-core primes QuickCheck text + ]; + benchmarkHaskellDepends = [ base tasty tasty-bench ]; + description = "Uniformly-random pre-factored numbers (Kalai)"; + license = lib.licenses.bsd3; + mainProgram = "grfn-exe"; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -131112,10 +131572,8 @@ self: { }: mkDerivation { pname = "grisette"; - version = "0.5.0.1"; - sha256 = "0wrvasr5kbz27ddwlmpxwzda4ya5phyn21hwi2ci7xgcfb0q3szh"; - revision = "2"; - editedCabalFile = "0sihj9hivxc3w3fr8yc8bp6wnphjspvm1fwgzx3iimsw26vb21cd"; + version = "0.6.0.0"; + sha256 = "12ylz5dbiwrp7zdvmdf95nwzrs9hvknn8bi5adhw54b65924qjrg"; libraryHaskellDepends = [ array async base bytestring deepseq generic-deriving hashable hashtables intern loch-th mtl parallel prettyprinter QuickCheck sbv @@ -134509,8 +134967,8 @@ self: { pname = "haddock-library"; version = "1.11.0"; sha256 = "02m2pr1jyn0k86bjqksn2vrpyv0y40sj3rq5svcs5c3qlg4mw1vw"; - revision = "3"; - editedCabalFile = "09qdpidav1pbvnch04j00dwn5jw4zigz5v37rwfhp9aabwl51bqp"; + revision = "5"; + editedCabalFile = "1gi861bwyizq164pl2ikqr3zmklifndizlr5hn1ly0zq58ram3yi"; libraryHaskellDepends = [ base containers parsec text ]; testHaskellDepends = [ base base-compat containers deepseq directory filepath hspec @@ -135104,10 +135562,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.16.2.0"; - sha256 = "1p3x9f1ha6dkis71nzbxh1h7mzldsj4qvmfx3f0vng7y1ydlcw0z"; - revision = "6"; - editedCabalFile = "1pdasij9bz7pzfb9f3lvvixzch7ac3xhqqx5cd3wjl40annawsaw"; + version = "4.16.2.1"; + sha256 = "1xcw8pcw9h82hxdlpp8z0ma2a1ssa5x2m32vizxh2a2pm5l1d3a7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135320,10 +135776,8 @@ self: { }: mkDerivation { pname = "hakyll-convert"; - version = "0.3.0.4"; - sha256 = "09fqr05mvs0qs53psq97kn1s4axinwn1vr5d6af4sqj3zc5k6k39"; - revision = "8"; - editedCabalFile = "1fwjxmdfq4wlwi77pmvvfydi0si8cbv4ygdrkbanl4d90scr2rn0"; + version = "0.3.0.5"; + sha256 = "0xnv0dxfajk4jl0d1a33cjpca21wnrvvm1194jxar58gqp9i0hr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137814,6 +138268,17 @@ self: { mainProgram = "hascal"; }) {}; + "hascalam" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hascalam"; + version = "0.1.1.1"; + sha256 = "1gpm73qgclh7x9fzq7pf6il5hbb4way3g2ap44xwp120cmr4wknq"; + libraryHaskellDepends = [ base ]; + description = "Haskell to and from Scalameta"; + license = lib.licenses.mit; + }) {}; + "hascar" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, binary, bytestring , conduit, containers, cryptohash, directory, exceptions, filepath @@ -138110,6 +138575,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_4_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , ghc-bignum, ghc-prim, HUnit, os-string, primitive, QuickCheck + , random, tasty, tasty-hunit, tasty-quickcheck, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.4.6.0"; + sha256 = "1jvqnzammb6gn13b9inlq5hhf8njphsvsl5ickby7j9g3mx2lr9l"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath ghc-bignum ghc-prim + os-string text + ]; + testHaskellDepends = [ + base bytestring filepath ghc-prim HUnit os-string primitive + QuickCheck random tasty tasty-hunit tasty-quickcheck text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -139411,8 +139898,30 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.26.8"; - sha256 = "15ibhysm9q94jrbxgby4kpmm1wh1yx2f1y0wcqfz958jqza77733"; + version = "0.26.9"; + sha256 = "1p6z9r5bajx90v4zf2z0gh156y4xi8p7kgfb2cgx1ckflk8d7nna"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + + "haskell-gi_0_26_10" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.26.10"; + sha256 = "1njgrs1rqngw128z8dvc69l3v9bpr4apa153anmg1cjv8ji91rqm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -139423,14 +139932,15 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.26.4"; - sha256 = "1c5i9nwf0ldgjyqm8qir5fs66d5pkyl9ajq77rcxy5bc7r7kbyws"; + version = "0.26.5"; + sha256 = "1malx9z9scw1dx8g33z6ix1chri6fzc1sr9mz7db2x7f6i472s0w"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -139579,19 +140089,19 @@ self: { "haskell-language-server" = callPackage ({ mkDerivation, aeson, aeson-pretty, apply-refact, array, async - , base, bytestring, Cabal-syntax, containers, data-default, deepseq - , Diff, directory, dlist, enummapset, extra, filepath, floskell - , foldl, fourmolu, fuzzy, ghc, ghc-boot, ghc-boot-th + , base, binary, bytestring, Cabal-syntax, containers, data-default + , deepseq, Diff, directory, dlist, enummapset, extra, filepath + , floskell, foldl, fourmolu, fuzzy, ghc, ghc-boot, ghc-boot-th , ghc-exactprint, ghc-lib-parser, ghc-lib-parser-ex, ghcide - , ghcide-bench, githash, hashable, hie-bios, hie-compat, hiedb - , hlint, hls-graph, hls-plugin-api, hls-test-utils, hp2pretty - , implicit-hie, lens, lens-aeson, list-t, lsp, lsp-test, lsp-types - , megaparsec, mod, monoid-subclasses, mtl, network-uri - , optparse-applicative, optparse-simple, ormolu, parser-combinators - , prettyprinter, process, process-extras, QuickCheck, random - , refact, regex-applicative, regex-tdfa, retrie, row-types - , safe-exceptions, semigroupoids, shake, shake-bench, sqlite-simple - , stan, stm, stm-containers, stylish-haskell, syb, tasty + , githash, hashable, hie-bios, hie-compat, hiedb, hlint, hls-graph + , hls-plugin-api, hls-test-utils, hp2pretty, implicit-hie, lens + , lens-aeson, list-t, lsp, lsp-test, lsp-types, megaparsec, mod + , monoid-subclasses, mtl, network-uri, optparse-applicative + , optparse-simple, ormolu, parser-combinators, prettyprinter + , process, process-extras, QuickCheck, random, refact + , regex-applicative, regex-tdfa, retrie, row-types, safe-exceptions + , semigroupoids, shake, shake-bench, sqlite-simple, stan, stm + , stm-containers, stylish-haskell, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck , tasty-rerun, template-haskell, temporary, text, text-rope, time , transformers, trial, unix, unliftio, unliftio-core @@ -139599,46 +140109,47 @@ self: { }: mkDerivation { pname = "haskell-language-server"; - version = "2.8.0.0"; - sha256 = "0nzqwm913s0d1m5irq4b65d2bl83qr916x44c9x35m7x04d78hrm"; + version = "2.9.0.0"; + sha256 = "171wn5nv42h00f2l6mcmdhf4vybmifkdk2ycz0v02vksd99h42fj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty apply-refact array base bytestring Cabal-syntax - containers data-default deepseq Diff directory dlist extra filepath - floskell foldl fourmolu fuzzy ghc ghc-boot ghc-boot-th - ghc-exactprint ghc-lib-parser ghc-lib-parser-ex ghcide githash - hashable hie-bios hie-compat hiedb hlint hls-graph hls-plugin-api - lens lsp lsp-types megaparsec mod mtl optparse-applicative - optparse-simple ormolu parser-combinators prettyprinter process - process-extras refact regex-applicative regex-tdfa retrie row-types - safe-exceptions semigroupoids sqlite-simple stan stm stm-containers + aeson aeson-pretty apply-refact array async base binary bytestring + Cabal-syntax containers data-default deepseq Diff directory dlist + extra filepath floskell foldl fourmolu fuzzy ghc ghc-boot + ghc-boot-th ghc-exactprint ghc-lib-parser ghc-lib-parser-ex ghcide + githash hashable hie-bios hie-compat hiedb hlint hls-graph + hls-plugin-api hls-test-utils lens lsp lsp-test lsp-types + megaparsec mod mtl optparse-applicative optparse-simple ormolu + parser-combinators prettyprinter process process-extras refact + regex-applicative regex-tdfa retrie row-types safe-exceptions + semigroupoids shake sqlite-simple stan stm stm-containers stylish-haskell syb template-haskell temporary text text-rope time transformers trial unliftio unliftio-core unordered-containers - vector + vector yaml ]; executableHaskellDepends = [ - base containers data-default directory extra filepath ghcide - hie-bios hls-plugin-api lsp lsp-types prettyprinter text - transformers unix unliftio-core + aeson base bytestring containers data-default directory extra + filepath ghcide hie-bios hls-graph hls-plugin-api hls-test-utils + lens lsp lsp-test lsp-types optparse-applicative prettyprinter + process safe-exceptions shake tasty-hunit text transformers unix + unliftio-core ]; testHaskellDepends = [ - aeson async base bytestring Cabal-syntax containers data-default - deepseq directory enummapset extra filepath fuzzy ghcide hashable + aeson base bytestring Cabal-syntax containers data-default deepseq + directory enummapset extra filepath fuzzy ghcide hashable hls-plugin-api hls-test-utils lens list-t lsp lsp-test lsp-types monoid-subclasses mtl network-uri ormolu parser-combinators process - QuickCheck random regex-tdfa row-types shake sqlite-simple stm - stm-containers tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text text-rope transformers - unordered-containers vector + QuickCheck random regex-tdfa shake sqlite-simple stm stm-containers + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-rerun text text-rope transformers unordered-containers vector ]; testToolDepends = [ fourmolu ghcide implicit-hie ormolu ]; benchmarkHaskellDepends = [ aeson base containers data-default directory extra filepath - ghcide-bench hls-plugin-api lens lens-aeson shake shake-bench text - yaml + hls-plugin-api lens lens-aeson shake shake-bench text yaml ]; - benchmarkToolDepends = [ ghcide-bench hp2pretty ]; + benchmarkToolDepends = [ hp2pretty ]; doHaddock = false; description = "LSP server for GHC"; license = lib.licenses.asl20; @@ -140343,25 +140854,6 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.13"; - sha256 = "09f0lad023zylkxidsz0nv532h44mh0b1505rvs3ypaq2v4q20pa"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit - template-haskell - ]; - description = "Parse source to template-haskell abstract syntax"; - license = lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_8_14" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty - , syb, tasty, tasty-hunit, template-haskell, th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; version = "0.8.14"; sha256 = "0dkillxs6rzznw01v72j92r013ff6q2wrm5wfr98d24nh1fcp404"; libraryHaskellDepends = [ @@ -140373,7 +140865,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -140904,8 +141395,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.3.3"; - sha256 = "06hh9lpib410spa65c2qva714v8ci07jdckhn9p38r9002ps8fp3"; + version = "1.4.0.0"; + sha256 = "0h8kb7l6qdph6qnsb4ki873ahdr3ncv19ckiyp2q7v2lchz0sxki"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141874,7 +142365,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "haskoin-node_1_1_0" = callPackage + "haskoin-node_1_1_3" = callPackage ({ mkDerivation, base, base64, bytestring, cereal, conduit , conduit-extra, containers, data-default, hashable, haskoin-core , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe @@ -141884,8 +142375,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "1.1.0"; - sha256 = "14sar39d3kjwv41mfwcywk9yv9vw4qx0x41dxfad9r565lhw59y2"; + version = "1.1.3"; + sha256 = "1bsbnfyk7abcgm9czcn0r2fiimiy7r6h9mxqbv464dpchgnnp9iy"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -141967,8 +142458,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.5"; - sha256 = "0p6cbvw2d6xskzm7wcgp6b2dzirnd38r64mvdp0njy2s1prlf92n"; + version = "1.5.11"; + sha256 = "0dfy2glrk6lc14m31nv5x80fkgzn3hlzyw0kw1yhpyidk5fg10vz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142870,6 +143361,26 @@ self: { broken = true; }) {}; + "hasmtlib" = callPackage + ({ mkDerivation, attoparsec, base, bitvec, bytestring, containers + , data-default, dependent-map, finite-typelits, lens, mtl + , smtlib-backends, smtlib-backends-process, some, text, utf8-string + , vector-sized + }: + mkDerivation { + pname = "hasmtlib"; + version = "1.1.0"; + sha256 = "04cai30751i10rwhc944c0b3fw1niid7pwjjjh7825k5mvq2dwf6"; + libraryHaskellDepends = [ + attoparsec base bitvec bytestring containers data-default + dependent-map finite-typelits lens mtl smtlib-backends + smtlib-backends-process some text utf8-string vector-sized + ]; + description = "A monad for interfacing with external SMT solvers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "haspara" = callPackage ({ mkDerivation, aeson, base, containers, data-default, doctest , exceptions, hashable, hspec, megaparsec, mtl, refined @@ -143632,20 +144143,19 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-transaction_1_1_1" = callPackage + "hasql-transaction_1_1_1_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-tree-builder - , contravariant, contravariant-extras, hasql, mtl, rerebase - , transformers + , contravariant, hasql, mtl, rerebase, transformers }: mkDerivation { pname = "hasql-transaction"; - version = "1.1.1"; - sha256 = "1fwk6ngwwpv992lbndxjbjzh7zvz3szijdcw4nnaahpf1w7iw96p"; + version = "1.1.1.1"; + sha256 = "0piinjmnfjl1khwbydqxam0sbzd0vsygfgz1iil52sfcfkl57a7b"; libraryHaskellDepends = [ - base bytestring bytestring-tree-builder contravariant - contravariant-extras hasql mtl transformers + base bytestring bytestring-tree-builder contravariant hasql mtl + transformers ]; - testHaskellDepends = [ async contravariant-extras hasql rerebase ]; + testHaskellDepends = [ async hasql rerebase ]; description = "Composable abstraction over retryable transactions for Hasql"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -144225,8 +144735,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.4.0.0"; - sha256 = "1vah61fs047h9v0c8z6ka0lcckhcsjrjxqcck0jipcppzpg68inw"; + version = "2.5.1.0"; + sha256 = "15psynsr61ahcmmm06lcprl47l271nqw2h0kwkahs6jy00l7ymhb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145416,6 +145926,38 @@ self: { broken = true; }) {}; + "hdmenu" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, bytestring-lexing + , containers, directory, double-conversion, hspec + , optparse-applicative, posix-paths, process, process-extras + , QuickCheck, text, tomland, unix, utf8-string + }: + mkDerivation { + pname = "hdmenu"; + version = "0.3.0"; + sha256 = "0n2mikqhrlsb79g2pdiryl3ynsy9vkcpg9fgrx0szqwqba1ckmqh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion optparse-applicative posix-paths process + process-extras text tomland unix utf8-string + ]; + executableHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion optparse-applicative posix-paths process + process-extras text tomland unix utf8-string + ]; + testHaskellDepends = [ + base base-prelude bytestring bytestring-lexing containers directory + double-conversion hspec optparse-applicative posix-paths process + process-extras QuickCheck text tomland unix utf8-string + ]; + description = "A small wrapper around dmenu"; + license = lib.licenses.gpl3Only; + mainProgram = "hdmenu"; + }) {}; + "hdo" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad , data-default, free, http-conduit, iproute, lens, mtl, network-uri @@ -145612,6 +146154,8 @@ self: { pname = "heap"; version = "1.0.4"; sha256 = "0ahpsfmb76728w71xn4021ad7z752n6aqqgzdpcyis9i22g4ihm4"; + revision = "1"; + editedCabalFile = "010mvg5syk0iprrin4kmqf21dmabyncmz1b65w5p05j9f4w22jfj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -145988,8 +146532,8 @@ self: { pname = "hedgehog"; version = "1.4"; sha256 = "1sz685n2ljriqwfpfy57adbsc6gyrd4x7jmy628803rfalqznjpm"; - revision = "5"; - editedCabalFile = "1majbvnqywyqfzm7qm7bhwmfzi3jamiz7d5ql4yvzsix8wg4rbag"; + revision = "8"; + editedCabalFile = "062nz959mb96gphk769kwym10xn4r7c7gdvibi8xjl9rmcsanq4q"; libraryHaskellDepends = [ ansi-terminal async barbies base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph @@ -146305,6 +146849,17 @@ self: { broken = true; }) {}; + "hedis-effectful" = callPackage + ({ mkDerivation, base, effectful-core, hedis }: + mkDerivation { + pname = "hedis-effectful"; + version = "1.0.0.0"; + sha256 = "0l9jiyns9d6zw65cb0ragb038aw0ma1q1a87s55xz7z1367wmj0r"; + libraryHaskellDepends = [ base effectful-core hedis ]; + description = "Adaptation of the hedis library for the effectful ecosystem"; + license = lib.licenses.bsd3; + }) {}; + "hedis-envy" = callPackage ({ mkDerivation, base, envy, hedis, scientific, time }: mkDerivation { @@ -147178,12 +147733,13 @@ self: { ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, boost, bytestring, Cabal , cabal-pkg-config-version-hook, cachix, cachix-api, conduit - , conduit-extra, containers, directory, dlist, exceptions, filepath - , hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core - , hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec - , hspec-discover, http-client, http-client-tls, http-conduit, HUnit - , inline-c, inline-c-cpp, katip, lens, lens-aeson, lifted-async - , lifted-base, monad-control, mtl, network, network-uri, nix + , conduit-extra, containers, directory, dlist, exceptions + , file-embed, filepath, hercules-ci-api, hercules-ci-api-agent + , hercules-ci-api-core, hercules-ci-cnix-expr + , hercules-ci-cnix-store, hostname, hspec, hspec-discover + , http-client, http-client-tls, http-conduit, HUnit, inline-c + , inline-c-cpp, katip, lens, lens-aeson, lifted-async, lifted-base + , monad-control, mtl, network, network-uri, nix , optparse-applicative, process, process-extras, profunctors , protolude, QuickCheck, safe-exceptions, scientific, servant , servant-auth-client, servant-client, servant-client-core, stm @@ -147194,15 +147750,14 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.10.3"; - sha256 = "1gfvlr37zzwnwnlixndwi9955c1n4yn67ffhif70d06bpjvh037k"; + version = "0.10.4"; + sha256 = "1bslpq4x0kp6k5x7jgcv8hkigp64p5gjgq6d3g60ig0pd35ribwd"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ aeson async base binary binary-conduit bytestring conduit - containers directory dlist exceptions filepath + containers directory dlist exceptions file-embed filepath hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store katip lens lens-aeson lifted-async lifted-base monad-control mtl network network-uri process @@ -147393,9 +147948,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.6.3"; - sha256 = "1mwsdc8xdf8c9cpzkvhg6z450d4n6s1ijraznzzvkgh0zwqggddq"; - enableSeparateDataOutput = true; + version = "0.3.6.4"; + sha256 = "0l5d4mirf8843svhamq2zwga46y0a4wr1myi3g46l92spljwribc"; setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; libraryHaskellDepends = [ aeson base bytestring conduit containers directory exceptions @@ -147950,10 +148504,8 @@ self: { doHaddock = false; description = "Symbolic EVM Evaluator"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "hevm"; maintainers = [ lib.maintainers.arturcygan ]; - broken = true; }) {inherit (pkgs) gmp; inherit (pkgs) libff; inherit (pkgs) secp256k1;}; @@ -148013,8 +148565,8 @@ self: { pname = "hex-text"; version = "0.1.0.9"; sha256 = "1dzv1jpjga4nsrxbwrh5nhnzv5f0mnl5i8da0blqc73vavsjhny5"; - revision = "1"; - editedCabalFile = "1r6lh44n7x6s1fk7nlqzychspi3647wsd0avraxlzqs32xslxgq1"; + revision = "2"; + editedCabalFile = "1ym53q8zpnl5vh049z4lki7l8154fbfvizrc5sf6wra5vqgvys35"; libraryHaskellDepends = [ base base16-bytestring bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring hspec text @@ -149071,14 +149623,14 @@ self: { "hgraph" = callPackage ({ mkDerivation, array, base, clock, containers, happy-dot, HUnit - , linear, mtl, random, transformers + , linear, mtl, random, say, transformers }: mkDerivation { pname = "hgraph"; - version = "1.2.0.1"; - sha256 = "0zdjnkisk1m5z8yz6r3sdprxxbikqffjx4aqw3qarafqb46kr9mv"; + version = "1.10.0.0"; + sha256 = "0689z5dy5zifpqdvhfarc96l386zfin6xgpgxkgj92dc4ps6wb9h"; libraryHaskellDepends = [ - array base containers happy-dot linear mtl random transformers + array base containers happy-dot linear mtl random say transformers ]; testHaskellDepends = [ base containers HUnit transformers ]; benchmarkHaskellDepends = [ @@ -149512,8 +150064,8 @@ self: { }: mkDerivation { pname = "hiedb"; - version = "0.6.0.0"; - sha256 = "1yz04cy981c1gpwcp758hhy1nlmavb9yciyp0mwcjamcazpqx562"; + version = "0.6.0.1"; + sha256 = "0pvbxjhwqd7abvb5j23ynlg0rsqc09c0vq915drb52cilbs46fcn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151028,8 +151580,8 @@ self: { }: mkDerivation { pname = "hix"; - version = "0.7.0"; - sha256 = "15dhr9xszg64kdswywc8pd8kfawq02mcarhh4lyq21g9cynvbk6g"; + version = "0.7.2"; + sha256 = "0n3sc5v8a7df4p4p4ch13alkv877djhbqz9qk3pb9pqvyhxy3xg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151363,8 +151915,29 @@ self: { }: mkDerivation { pname = "hkgr"; - version = "0.4.4"; - sha256 = "03vz4f7jjklbjsmh17kljnnbpk5m5a0r1q67g1r23vhpx2dkk7vk"; + version = "0.4.5"; + sha256 = "1fw32ik8j72kykq7cwjgp9gajssbk24ybkx0ly5wvyav429b11lz"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring directory extra filepath simple-cabal simple-cmd + simple-cmd-args simple-prompt typed-process xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + mainProgram = "hkgr"; + }) {}; + + "hkgr_0_4_6" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , simple-cabal, simple-cmd, simple-cmd-args, simple-prompt + , typed-process, xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.4.6"; + sha256 = "1qhj3rfmdvc93m0zs38sw21lrnhk8vkrns0ca6dva0nsfi6fi5n9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -151374,6 +151947,7 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "hkgr"; }) {}; @@ -151529,7 +152103,7 @@ self: { ]; }) {}; - "hledger_1_33_1" = callPackage + "hledger_1_34" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -151540,10 +152114,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.33.1"; - sha256 = "14vx74c1lj4kj81p9qrdi9ln8fs15dk3xz0yy3aaq7xp979jj21f"; - revision = "1"; - editedCabalFile = "1bbh8vbc8n539manidahnkqvskg4wzmf6y00f8wxga80dm5djadl"; + version = "1.34"; + sha256 = "08ygx4aavimxzmyvb9303xds455vs72jvkbrj41nca8357118j3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151715,6 +152287,8 @@ self: { pname = "hledger-iadd"; version = "1.3.21"; sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; + revision = "1"; + editedCabalFile = "1jx773cqq676yvzibp7nzdpmas8i7ahx8j6kfc1sfipk37vz2q0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151746,8 +152320,8 @@ self: { pname = "hledger-interest"; version = "1.6.6"; sha256 = "0hklpg9sgghrcvkrgz7kfr8jc6kwsv8zzpbbg0c3idhbdxwg74d8"; - revision = "3"; - editedCabalFile = "0yywynp3yrdssh2vr7jwp0izr890hfn9kjy6cl9ad8mx1qfyg771"; + revision = "4"; + editedCabalFile = "0b1dvr9kyzhm8zf60xvqf2hkad8w6m14fr2prm0fry8lq79gc515"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151819,7 +152393,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_33_1" = callPackage + "hledger-lib_1_34" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat, blaze-markup, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, colour, containers, data-default @@ -151832,10 +152406,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.33.1"; - sha256 = "12l3c6ixmfb65c566vgrfksggrpgab11f1v658dk5gy482p994vb"; - revision = "1"; - editedCabalFile = "1wkp0lyihjqc7figv29sw37g7d6i7zwzddi8jvjqpbpcffrcj81r"; + version = "1.34"; + sha256 = "0789zyz5lbd67mphr8qq8wryni6dkf3759ah9fb7cm2wr5wwvd85"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -151941,26 +152513,25 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_33_1" = callPackage + "hledger-ui_1_34" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath - , fsnotify, hledger, hledger-lib, megaparsec, microlens + , fsnotify, githash, hledger, hledger-lib, megaparsec, microlens , microlens-platform, mtl, process, safe, split, text, text-zipper , time, transformers, unix, vector, vty, vty-crossplatform }: mkDerivation { pname = "hledger-ui"; - version = "1.33.1"; - sha256 = "1x05jdm6aargcnghvmdayzacigc8is5ra8xpnava499kwqk5x66i"; - revision = "1"; - editedCabalFile = "0q29ix824in8mwdr6mg13b7hrzpv55mkrfwm5r84jsv1mxlbslvp"; + version = "1.34"; + sha256 = "0w80bl6m98hsjzdpj5vjd768qs32vf8vdqzg6srh2z3pl36pjiki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal async base brick cmdargs containers data-default - directory doclayout extra filepath fsnotify hledger hledger-lib - megaparsec microlens microlens-platform mtl process safe split text - text-zipper time transformers unix vector vty vty-crossplatform + directory doclayout extra filepath fsnotify githash hledger + hledger-lib megaparsec microlens microlens-platform mtl process + safe split text text-zipper time transformers unix vector vty + vty-crossplatform ]; executableHaskellDepends = [ base ]; description = "Terminal interface for the hledger accounting system"; @@ -152027,34 +152598,32 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_33_1" = callPackage + "hledger-web_1_34" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory - , extra, filepath, hjsmin, hledger, hledger-lib, hspec, http-client - , http-conduit, http-types, megaparsec, mtl, network, safe - , shakespeare, template-haskell, text, time, transformers + , extra, filepath, githash, hjsmin, hledger, hledger-lib, hspec + , http-client, http-conduit, http-types, megaparsec, mtl, network + , safe, shakespeare, template-haskell, text, time, transformers , unix-compat, unordered-containers, utf8-string, wai, wai-cors , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core , yesod-form, yesod-static, yesod-test }: mkDerivation { pname = "hledger-web"; - version = "1.33.1"; - sha256 = "1f5xk0s93n2r8ar0l3hxfxxvi5gbb2sn1fhlg8mvkjbh93krywqr"; - revision = "1"; - editedCabalFile = "040sls51agm49s2p9wdpq5vly3d210dib87q312dlk6238p7hap5"; + version = "1.34"; + sha256 = "1h39gjpdddnyryig4713pq9ipixzavr0mb7wlmzr5sbzqmnshbds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64 blaze-html blaze-markup bytestring case-insensitive clientsession cmdargs conduit conduit-extra - containers data-default Decimal directory extra filepath hjsmin - hledger hledger-lib hspec http-client http-conduit http-types - megaparsec mtl network safe shakespeare template-haskell text time - transformers unix-compat unordered-containers utf8-string wai - wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core - yesod-form yesod-static yesod-test + containers data-default Decimal directory extra filepath githash + hjsmin hledger hledger-lib hspec http-client http-conduit + http-types megaparsec mtl network safe shakespeare template-haskell + text time transformers unix-compat unordered-containers utf8-string + wai wai-cors wai-extra wai-handler-launch warp yaml yesod + yesod-core yesod-form yesod-static yesod-test ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -152795,8 +153364,8 @@ self: { }: mkDerivation { pname = "hls-graph"; - version = "2.8.0.0"; - sha256 = "0s8igxwbg7r0yjz6975vz7zw4yj9ik8733p0n7zcyvcv87ankxkd"; + version = "2.9.0.0"; + sha256 = "19ifqsw6bfqy969icbgyl46ss178wjn37dfhrh6ch3k6pa3lz73l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions @@ -152922,29 +153491,29 @@ self: { }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, co-log-core, containers, criterion - , data-default, deepseq, dependent-map, dependent-sum, Diff, dlist - , extra, filepath, ghc, hashable, hls-graph, hw-fingertree, lens - , lens-aeson, lsp, lsp-types, megaparsec, mtl, opentelemetry - , optparse-applicative, prettyprinter, random, random-fu - , regex-tdfa, row-types, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unordered-containers + ({ mkDerivation, aeson, base, bytestring, co-log-core, containers + , criterion, data-default, deepseq, dependent-map, dependent-sum + , Diff, dlist, extra, filepath, ghc, hashable, hls-graph + , hw-fingertree, lens, lens-aeson, lsp, lsp-types, megaparsec, mtl + , opentelemetry, optparse-applicative, prettyprinter, random + , random-fu, regex-tdfa, stm, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, time, transformers, unix + , unliftio, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "2.8.0.0"; - sha256 = "0s5jywzafd1dyhya4n80w1i7si4br7wmxwp6q3f11f787qqbv5xs"; + version = "2.9.0.0"; + sha256 = "0s0yd66cbazifxqqsyw05rdwc88kbx9q434ihlzgw72mkn0pvcm0"; libraryHaskellDepends = [ aeson base co-log-core containers data-default dependent-map dependent-sum Diff dlist extra filepath ghc hashable hls-graph hw-fingertree lens lens-aeson lsp megaparsec mtl opentelemetry - optparse-applicative prettyprinter regex-tdfa row-types stm text - time transformers unix unliftio unordered-containers + optparse-applicative prettyprinter regex-tdfa stm text time + transformers unix unliftio unordered-containers ]; testHaskellDepends = [ - base containers data-default lens lsp-types tasty tasty-hunit - tasty-quickcheck tasty-rerun text + aeson base bytestring containers data-default lens lsp-types tasty + tasty-golden tasty-hunit tasty-quickcheck tasty-rerun text ]; benchmarkHaskellDepends = [ base criterion deepseq lsp-types random random-fu @@ -153232,19 +153801,19 @@ self: { "hls-test-utils" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , data-default, directory, extra, filepath, ghcide, hls-plugin-api - , lens, lsp-test, lsp-types, row-types, safe-exceptions, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun - , temporary, text + , lens, lsp, lsp-test, lsp-types, neat-interpolation + , safe-exceptions, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-rerun, temporary, text, text-rope }: mkDerivation { pname = "hls-test-utils"; - version = "2.8.0.0"; - sha256 = "1fk6n88g9z4yihvimzwi0bnmysr77qv3zdlcpr62lczl8pvm89d2"; + version = "2.9.0.0"; + sha256 = "0xj7hfpa6yl4v0ysbd7abkpax5y4hj0pfhzb40wp0qp5x6prsgw7"; libraryHaskellDepends = [ aeson async base bytestring containers data-default directory extra - filepath ghcide hls-plugin-api lens lsp-test lsp-types row-types - safe-exceptions tasty tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text + filepath ghcide hls-plugin-api lens lsp lsp-test lsp-types + neat-interpolation safe-exceptions tasty tasty-expected-failure + tasty-golden tasty-hunit tasty-rerun temporary text text-rope ]; description = "Utilities used in the tests of Haskell Language Server"; license = lib.licenses.asl20; @@ -154308,7 +154877,7 @@ self: { license = lib.licenses.mit; }) {}; - "hoauth2_2_13_1" = callPackage + "hoauth2_2_14_0" = callPackage ({ mkDerivation, aeson, base, base64, binary, bytestring , containers, crypton, data-default, exceptions, hspec , hspec-discover, http-conduit, http-types, memory, microlens, text @@ -154316,8 +154885,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "2.13.1"; - sha256 = "0m6bn52j2425km0h6mx8zbmc3rbwdj0ar08jy9m96v5hwzdfch4i"; + version = "2.14.0"; + sha256 = "1gbdb01iinhcfc91iw2ld4lpvmpcvy6d9r1zl5a58jg16z5v6j8k"; libraryHaskellDepends = [ aeson base base64 binary bytestring containers crypton data-default exceptions http-conduit http-types memory microlens text @@ -154338,8 +154907,8 @@ self: { }: mkDerivation { pname = "hoauth2-demo"; - version = "1.11.0"; - sha256 = "12vxm1kfdbhvsagmqslr4wph9ji49gcakkvcqdx84d5y6ywd05wh"; + version = "1.12.0"; + sha256 = "03nsjqpaz3b5809rhjc1bqjm84w8srfcbn6ncj42w6g74hb3lmab"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -154363,8 +154932,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers"; - version = "0.7.1"; - sha256 = "0222kkbnw4fpzyr0f3pls19bnlgs89yal3ffw85x6qdrg2lqk006"; + version = "0.8.0"; + sha256 = "11y4lbp81spa7wky834l7i0fkqq3b529zn7divz5x9ar0jnnpnaj"; libraryHaskellDepends = [ aeson base bytestring containers crypton hoauth2 HsOpenSSL http-conduit http-types jose-jwt mtl text time transformers @@ -154385,8 +154954,8 @@ self: { }: mkDerivation { pname = "hoauth2-providers-tutorial"; - version = "0.7.0"; - sha256 = "02gdx3ry1f61czc37r84z1qz25ybvgm6p88li03iyl87ihajymw4"; + version = "0.8.0"; + sha256 = "1b9sjwirkjwl3w54y9pq4i07xp3spsm7zxknf9xilw4jgg9mmncz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154407,8 +154976,8 @@ self: { }: mkDerivation { pname = "hoauth2-tutorial"; - version = "0.7.0"; - sha256 = "1jv87hlz22jvyq5z2ax3jc4g3if0ap1j8g4hxxc62skx1d7jp99x"; + version = "0.8.0"; + sha256 = "0w7fa1gyslng19sxk3xnvy1bvy0r2gannypvlv9hi86hinwx525j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155659,8 +156228,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.8.0"; - sha256 = "122caz296w8sfc0ma4zigssha8vbr8abgj9ajsr83jh9k68jy3d9"; + version = "0.9.0"; + sha256 = "0fxj2w762zdl3lzknpglmlwm3dgxsaw8vrljm73fb3gcscj9flbc"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -155675,8 +156244,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.8.0"; - sha256 = "0vkf5ajmdy7h88vfz2aq5zzq4mrnl4wi0dqn0rzzbr3rjpip42j6"; + version = "0.9.0"; + sha256 = "16pa8w05fa11xl7cv3gz36j5xk8rxsi341a1wgm513m0ghqxyaqw"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -155693,8 +156262,8 @@ self: { }: mkDerivation { pname = "hoppy-runtime"; - version = "0.8.0"; - sha256 = "123mn1sfwy01jyb803r4rhdqpdafmbkyip149ga1pvlaj272mlqy"; + version = "0.9.0"; + sha256 = "0ndabz5yb98d7xpjsgsvqvvaslvsg3pcmd1ms9n93lsx4xv4xkpx"; libraryHaskellDepends = [ base Cabal containers directory filepath hoppy-generator ]; @@ -155707,8 +156276,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.8.0"; - sha256 = "0ysbnhabnrr0jb8f9a06fqqxv2sy7ahj92jhw2bifnvjffk1pnqd"; + version = "0.9.0"; + sha256 = "1vgpdkmy2pzfj2gl10pdc45i80d73vgi5mhcd82if1rgc4zvqjas"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -156118,6 +156687,8 @@ self: { pname = "hourglass"; version = "0.2.12"; sha256 = "0jnay5j13vpz6i1rkaj3j0d9v8jfpri499xn3l7wd01f81f5ncs4"; + revision = "1"; + editedCabalFile = "0yc9k9lrx6z5r52mk3hra4v74ksk590d89lrj934bj1hrnv6ri45"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time @@ -156340,6 +156911,46 @@ self: { mainProgram = "hpack"; }) {}; + "hpack_0_36_1" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, crypton, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, mtl, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.36.1"; + sha256 = "1n02wkkhgqwh7im33b2158h9ha0yglzmqv05fd0igmm4mfly05db"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob http-client http-client-tls http-types + infer-license mtl pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers crypton deepseq + directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery mtl pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "hpack"; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -156651,14 +157262,14 @@ self: { mainProgram = "hpc-codecov"; }) {}; - "hpc-codecov_0_6_0_0" = callPackage + "hpc-codecov_0_6_1_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, hpc, process, tasty, tasty-golden, tasty-hunit, time }: mkDerivation { pname = "hpc-codecov"; - version = "0.6.0.0"; - sha256 = "1if8nmqv6pcv92ww8ncaxkvaawdr9shmsdsnr9xvzfmhqjq83q7w"; + version = "0.6.1.0"; + sha256 = "1f4zbqbd78qavz3ggxjs1fp1bcp0a764mi2ykimdl4bl0y701xmb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157100,8 +157711,8 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.6.2"; - sha256 = "118758mwqwf22i5y7iawqqwibyljfn5cxlx6hjbz1xgxcvchvm65"; + version = "0.6.3"; + sha256 = "0x7qiwmh5aqix0an24qm9z1580v6c8q59mq7i6nzchm0bk7nj3py"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158609,6 +159220,7 @@ self: { description = "A library for Passbook pass creation & signing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "hs-popen" = callPackage @@ -160283,6 +160895,85 @@ self: { broken = true; }) {}; + "hsec-core" = callPackage + ({ mkDerivation, base, Cabal-syntax, cvss, osv, pandoc-types, safe + , tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "hsec-core"; + version = "0.1.0.0"; + sha256 = "0yf6vdv1v3r52i92pcjh7jpnxwxlax9vpchy0f2ixs0ddgsk6v83"; + libraryHaskellDepends = [ + base Cabal-syntax cvss osv pandoc-types safe text time + ]; + testHaskellDepends = [ base cvss tasty tasty-hunit text ]; + description = "Core package representing Haskell advisories"; + license = lib.licenses.bsd3; + }) {}; + + "hsec-sync" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, extra, feed + , filepath, hsec-core, http-client, lens, optparse-applicative + , process, tasty, tasty-hunit, temporary, text, time, transformers + , wreq + }: + mkDerivation { + pname = "hsec-sync"; + version = "0.1.0.0"; + sha256 = "0svk3rvsf6svhy2vqr5bpxxgngjmxb9zxwj9ljx4n56yq2gvqdp9"; + revision = "1"; + editedCabalFile = "1xk4f5yh720d16gxark20cbdywg9jrlrhd20x153a74p2gka44rm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory extra feed filepath hsec-core http-client lens + process text time transformers wreq + ]; + executableHaskellDepends = [ + aeson base bytestring filepath optparse-applicative text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary text + time + ]; + description = "Synchronize with the Haskell security advisory database"; + license = lib.licenses.bsd3; + mainProgram = "hsec-sync"; + }) {}; + + "hsec-tools" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , Cabal-syntax, commonmark, commonmark-pandoc, containers, cvss + , directory, extra, feed, filepath, hsec-core, lucid, mtl + , optparse-applicative, osv, pandoc-types, parsec, pathwalk + , pretty-simple, process, safe, tasty, tasty-golden, tasty-hunit + , text, time, toml-parser, validation-selective + }: + mkDerivation { + pname = "hsec-tools"; + version = "0.1.0.0"; + sha256 = "1q48ygbw463jm77cv3sznbncr496rqzqrablj02s1vdwihkv3h86"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base Cabal-syntax commonmark commonmark-pandoc containers + cvss directory extra feed filepath hsec-core lucid mtl osv + pandoc-types parsec pathwalk process safe text time toml-parser + validation-selective + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal-syntax filepath hsec-core + optparse-applicative text validation-selective + ]; + testHaskellDepends = [ + aeson-pretty base Cabal-syntax cvss directory hsec-core + pretty-simple tasty tasty-golden tasty-hunit text time + ]; + description = "Tools for working with the Haskell security advisory database"; + license = lib.licenses.bsd3; + mainProgram = "hsec-tools"; + }) {}; + "hsemail" = callPackage ({ mkDerivation, base, hspec, parsec, time, time-compat }: mkDerivation { @@ -160316,8 +161007,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.3.1"; - sha256 = "0vcrh15p479x7yl4npr85wqalgkzs76h4smqwlsrp9m4w4lgaskz"; + version = "0.1.3.2"; + sha256 = "19qkaavyankx5lmrf03n108d7hyfj7ls1hkxcgdp7jnf7wrwkpdq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -161015,8 +161706,8 @@ self: { }: mkDerivation { pname = "hslua-module-doclayout"; - version = "1.1.1"; - sha256 = "051rvq7x8cnby0fv14i9qy0j1d46rkmwbx5b09nqgb51i03wsivf"; + version = "1.1.1.2"; + sha256 = "1bgs6p20maqdwmqjv8nqsmlk63sjhb54icqs7d1kxsk8k9hh65qg"; libraryHaskellDepends = [ base doclayout hslua text ]; testHaskellDepends = [ base doclayout hslua tasty tasty-hunit tasty-lua text @@ -161051,8 +161742,8 @@ self: { }: mkDerivation { pname = "hslua-module-system"; - version = "1.1.1"; - sha256 = "0adjxcyxb8xc98jj2r6xhbswqkqvs4c40sn4m9gl0bkjhh0nk57q"; + version = "1.1.2"; + sha256 = "1pi1yp5ch83b74diimbrq09gd9wq8cjpxwjzv9jvchf2xrz8winl"; libraryHaskellDepends = [ base directory exceptions hslua-core hslua-marshalling hslua-packaging temporary text @@ -161586,8 +162277,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.11.8"; - sha256 = "1w0ryyr9h1f87jgz56yl09x3yvd9zm2w1bj70k5p6pzdyz984cjr"; + version = "2.11.9"; + sha256 = "16rh30v2mx01yi72k8kiwmwgnv98xv59d9n6ap8jpyn7p96nmsir"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -161601,8 +162292,8 @@ self: { }: mkDerivation { pname = "hspec-api"; - version = "2.11.8"; - sha256 = "02hhmxgd4vz5jakp3nd6cwslh8qmqnlg6j3fq7my8lbdim95wnf6"; + version = "2.11.9"; + sha256 = "1hzv4q63yd60kypnil3hmsf8v92ig2ankafhavd0jf5hgdjd2wnk"; libraryHaskellDepends = [ base hspec-core transformers ]; testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; @@ -161707,8 +162398,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.11.8"; - sha256 = "18zaiac5s830q01hq9ai67z5sk0ilvhz471vxabraif3rznrsmla"; + version = "2.11.9"; + sha256 = "0qzzwyx71741v53qd9pah5bqq8md3mj0l6ykaw3d4816c2np5wdi"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck @@ -161775,8 +162466,8 @@ self: { }: mkDerivation { pname = "hspec-discover"; - version = "2.11.8"; - sha256 = "0s81mjb7an628c0gr3g74navnxzfahdl92zixdgys2is5rbd6yqf"; + version = "2.11.9"; + sha256 = "054l0k6rn7n1mm3ivhvv00zmqdkdnrp91h5l2wy6sbibrvrl8rhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -161891,6 +162582,8 @@ self: { pname = "hspec-expectations-pretty-diff"; version = "0.7.2.6"; sha256 = "0wksgvdj50yc3p4bg3wmacf2w75v7p8nlq1g33z5amrwllig6m49"; + revision = "1"; + editedCabalFile = "161n217lg9r8sw3gd654ri7dr2h27hkvcbpjbf38sl44j3zha17d"; libraryHaskellDepends = [ ansi-terminal base Diff hscolour HUnit nicify-lib text unicode-show ]; @@ -162032,21 +162725,23 @@ self: { }) {}; "hspec-junit-formatter" = callPackage - ({ mkDerivation, base, conduit, containers, directory, exceptions - , filepath, hspec, hspec-core, iso8601-time, markdown-unlit - , temporary, text, time, xml-conduit, xml-types + ({ mkDerivation, array, base, conduit, containers, directory + , exceptions, filepath, hspec, hspec-api, hspec-core, hspec-golden + , iso8601-time, markdown-unlit, regex-base, regex-tdfa, temporary + , text, time, xml-conduit, xml-types }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.1.0.2"; - sha256 = "1gzgfisji7w4gsixlchlrg5ylkmdqq2mk5sc0jdwqxz865kjq01g"; + version = "1.1.2.0"; + sha256 = "0r2kk4qh1m6pbjwwv5vak0xhn45bxa83cyr2dhzh2n0skm9gqrks"; libraryHaskellDepends = [ - base conduit containers directory exceptions filepath hspec-core - iso8601-time text time xml-conduit xml-types + array base conduit containers directory exceptions filepath + hspec-api hspec-core iso8601-time regex-base regex-tdfa text time + xml-conduit xml-types ]; testHaskellDepends = [ - base containers filepath hspec markdown-unlit temporary text - xml-conduit + base containers filepath hspec hspec-golden markdown-unlit + temporary text xml-conduit ]; testToolDepends = [ markdown-unlit ]; description = "A JUnit XML runner/formatter for hspec"; @@ -162144,8 +162839,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.11.8"; - sha256 = "0diwxrp6rkf0pchfnfhc5xdbhv9arbbmpgl8hyw5afbfmqjsd4kv"; + version = "2.11.9"; + sha256 = "09cl2dknj548zzmdfx1pyd27jywgcr4000hf1rscn85b4r2riymm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162535,6 +163230,34 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-yesod" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie + , exceptions, hspec, hspec-core, html-conduit, http-types, HUnit + , memory, mtl, network, pretty-show, text, time, transformers + , unliftio, unliftio-core, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form, yesod-test + }: + mkDerivation { + pname = "hspec-yesod"; + version = "0.1.0"; + sha256 = "1ixra4fdfrihlnigqs63xwyrl7ab4kwl7klmhv6xfvprs798g4mb"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie exceptions hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + yesod-test + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form yesod-test + ]; + description = "A variation of yesod-test that follows hspec idioms more closely"; + license = lib.licenses.mit; + }) {}; + "hspec2" = callPackage ({ mkDerivation, base, hspec, hspec-discover }: mkDerivation { @@ -162601,8 +163324,8 @@ self: { }: mkDerivation { pname = "hspray"; - version = "0.5.2.0"; - sha256 = "05fkyvb9h5hnv44nkk7ykhmhcajfc393rmn2a7dzqqgam44wpydl"; + version = "0.5.4.0"; + sha256 = "01y4jgbhvis0aa2imc1is62zcgwkqysz2v8vvld0y5c92j0f3y6s"; libraryHaskellDepends = [ base containers extra hashable matrix numeric-prelude text unordered-containers @@ -163897,7 +164620,6 @@ self: { libraryHaskellDepends = [ attoparsec base html-parse text ]; description = "Utility functions for working with html-parse"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.slotThe ]; }) {}; @@ -164269,7 +164991,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http-api-data_0_6" = callPackage + "http-api-data_0_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, cookie, hashable , hspec, hspec-discover, http-types, HUnit, QuickCheck , quickcheck-instances, tagged, text, text-iso8601, time-compat @@ -164277,10 +164999,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.6"; - sha256 = "0ihkvjhm1rfgfnr2s5kzsmmqbnxgmyaxi0gqzqs4lxyhvy14743l"; - revision = "1"; - editedCabalFile = "0vjxs10hv9xhnahzcqb4dlygfzj5rcybgzw2z7qb2mi6sjsllwpv"; + version = "0.6.1"; + sha256 = "1kz3qjjazl61q7iad6q67zdsm2gynsjdfcn34rzmybjhq27wylas"; libraryHaskellDepends = [ base bytestring containers cookie hashable http-types tagged text text-iso8601 time-compat transformers unordered-containers @@ -165283,8 +166003,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.6.0.2"; - sha256 = "13ln90didwh4r0jb77i05csmimrl9p1mv71c7ygz9bi3zk8mvl7l"; + version = "0.6.0.3"; + sha256 = "0bixa4grhg7f0xxlr70aj96rqd5p33kipsf5jmcp3jz00mj178wg"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive conduit conduit-extra containers http-client http-types network resourcet @@ -165328,8 +166048,8 @@ self: { }: mkDerivation { pname = "http-semantics"; - version = "0.0.0"; - sha256 = "04wi14c0hy2dpzazv6v49100dc4r16rzkii14625xkijcgjlcx7w"; + version = "0.1.2"; + sha256 = "1xrlglwsjpyhpxkxchx3kgysm39a8c7bddvps0n71ax75px2laq9"; libraryHaskellDepends = [ array base bytestring case-insensitive http-types network network-byte-order time-manager utf8-string @@ -165559,7 +166279,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "http2_5_2_1" = callPackage + "http2_5_2_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers , crypton, directory, filepath, gauge, Glob, hspec, hspec-discover @@ -165570,8 +166290,8 @@ self: { }: mkDerivation { pname = "http2"; - version = "5.2.1"; - sha256 = "0qgyykw866m06d8br6ppwwq3dxzm028gssjq402qfs46axxkxzdf"; + version = "5.2.5"; + sha256 = "0v8k69l8my8l291vhvf004wn5xd79zgfpvyvmak3dibvrr5pj4as"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165611,6 +166331,7 @@ self: { testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "http2-client-exe" = callPackage @@ -165715,8 +166436,8 @@ self: { }: mkDerivation { pname = "http2-tls"; - version = "0.2.11"; - sha256 = "1vi55fk0n168j42n83mdiifqksh7d2fq3pyg3fq06b7bj1597khm"; + version = "0.3.0"; + sha256 = "0daf7fnnhx8zd3zqacx3zbd89zm7sg87vggw93n9cy2hms6dr40k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165739,8 +166460,8 @@ self: { }: mkDerivation { pname = "http3"; - version = "0.0.11"; - sha256 = "1z3hqalylraxmx18h82gljpbaslzd8mz2ndv8g15mhfac6jjz4rd"; + version = "0.0.13"; + sha256 = "1d6mjncmh4d1x9a5sss9jnyjzqkr95afpli0v7jaz3nayvx5r34h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167574,21 +168295,22 @@ self: { }) {}; "hw-polysemy" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, contravariant - , Diff, directory, filepath, generic-lens, ghc-prim, lens, network - , polysemy, polysemy-log, polysemy-plugin, polysemy-time, process - , resourcet, stm, tasty, tasty-discover, tasty-hedgehog, temporary - , text, time, unliftio, yaml + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring + , contravariant, Diff, directory, exceptions, filepath + , generic-lens, ghc-prim, lens, mtl, network, polysemy + , polysemy-log, polysemy-plugin, polysemy-time, process, resourcet + , stm, tasty, tasty-discover, tasty-hedgehog, temporary, text, time + , transformers, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.4.2"; - sha256 = "1czisgq8yv8gmr9ixs72y7yfajs95333698blfnj2ipngcmkrh09"; + version = "0.2.10.0"; + sha256 = "1fqykjvknsl5m67szyzy9jg9z1q9abvl5jk6d7m51ml9i6zj7vxz"; libraryHaskellDepends = [ - aeson async base bytestring contravariant Diff directory filepath - generic-lens ghc-prim lens network polysemy polysemy-log - polysemy-plugin polysemy-time process resourcet stm temporary text - time unliftio yaml + aeson aeson-pretty async base bytestring contravariant Diff + directory exceptions filepath generic-lens ghc-prim lens mtl + network polysemy polysemy-log polysemy-plugin polysemy-time process + resourcet stm temporary text time transformers unliftio yaml ]; testHaskellDepends = [ base filepath polysemy polysemy-log polysemy-plugin tasty @@ -169007,32 +169729,40 @@ self: { }) {}; "hyperbole" = callPackage - ({ mkDerivation, base, bytestring, casing, containers, effectful - , file-embed, http-api-data, http-types, network - , string-conversions, string-interpolate, text, wai - , wai-middleware-static, wai-websockets, warp, web-view, websockets + ({ mkDerivation, base, bytestring, casing, containers, cookie + , effectful, file-embed, http-api-data, http-types, network + , string-conversions, string-interpolate, sydtest, sydtest-discover + , text, wai, wai-middleware-static, wai-websockets, warp, web-view + , websockets }: mkDerivation { pname = "hyperbole"; - version = "0.2.0"; - sha256 = "04b9mgcd06dh8v1ki06dbgx9ak070p5h5pb5njyg99s8cykdip5r"; + version = "0.3.6"; + sha256 = "0s3hsr6yhsqxayl22bafgrgan2jrjyg2027qj35gvxr20z1vsg12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring casing containers effectful file-embed + base bytestring casing containers cookie effectful file-embed http-api-data http-types network string-conversions string-interpolate text wai wai-websockets warp web-view websockets ]; executableHaskellDepends = [ - base bytestring casing containers effectful file-embed + base bytestring casing containers cookie effectful file-embed http-api-data http-types network string-conversions string-interpolate text wai wai-middleware-static wai-websockets warp web-view websockets ]; - description = "Web Framework inspired by HTMX"; + testHaskellDepends = [ + base bytestring casing containers cookie effectful file-embed + http-api-data http-types network string-conversions + string-interpolate sydtest text wai wai-websockets warp web-view + websockets + ]; + testToolDepends = [ sydtest-discover ]; + description = "Interactive HTML apps using type-safe serverside Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "example"; + mainProgram = "examples"; }) {}; "hyperdrive" = callPackage @@ -170750,6 +171480,7 @@ self: { ]; description = "JSX-like but for Haskell"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "ihs" = callPackage @@ -171712,8 +172443,8 @@ self: { }: mkDerivation { pname = "incipit"; - version = "0.9.0.1"; - sha256 = "0zalzp5p59cqz3zky1y0xvw5g44z386z5smffmzhx1gjk6v0b3pk"; + version = "0.10.0.0"; + sha256 = "0464gn50ayfd61n2xzcdrg36vmzls3j6bi2w7113iqzbl8q8gz6j"; libraryHaskellDepends = [ base incipit-core polysemy-conc polysemy-log polysemy-resume polysemy-time @@ -172192,23 +172923,11 @@ self: { ({ mkDerivation, array, base, containers, transformers }: mkDerivation { pname = "indexed-traversable"; - version = "0.1.3"; - sha256 = "1nak3bq3yzai8b38mflmpsbirx8d6v29zcj9m193m3ppnrgr4chx"; - libraryHaskellDepends = [ array base containers transformers ]; - description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable_0_1_4" = callPackage - ({ mkDerivation, array, base, containers, transformers }: - mkDerivation { - pname = "indexed-traversable"; version = "0.1.4"; sha256 = "08ivs1shxnvw5fzklvg7yh4xy0nnh3gsglm059fa5m9svyphkgjq"; libraryHaskellDepends = [ array base containers transformers ]; description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indexed-traversable-instances" = callPackage @@ -172218,30 +172937,6 @@ self: { }: mkDerivation { pname = "indexed-traversable-instances"; - version = "0.1.1.2"; - sha256 = "0jippsyqg8ss61z5vc6vfjmlrirwc69kr4azs5s9z0fcbj4lx6qg"; - revision = "2"; - editedCabalFile = "0yrww1y9zrnqwymik9kkdqkx81n3jhr0kq27lpvy1gp297hy7m80"; - libraryHaskellDepends = [ - base indexed-traversable OneTuple tagged unordered-containers - vector - ]; - testHaskellDepends = [ - base containers indexed-traversable OneTuple QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; - license = lib.licenses.bsd2; - }) {}; - - "indexed-traversable-instances_0_1_2" = callPackage - ({ mkDerivation, base, containers, indexed-traversable, OneTuple - , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "indexed-traversable-instances"; version = "0.1.2"; sha256 = "1hf75x729c3348yvgxk0pjab2mmwi0xxcw3h2yb6c78lp8pvcarw"; libraryHaskellDepends = [ @@ -172255,7 +172950,6 @@ self: { ]; description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "indextype" = callPackage @@ -172663,6 +173357,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Inflections library for Haskell"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "inflist" = callPackage @@ -174781,6 +175476,8 @@ self: { pname = "io-classes-mtl"; version = "0.1.2.0"; sha256 = "06lcz96rja31hk3229zxz9ip45c2xqr563kv66jc2f9zyjy7z8s7"; + revision = "1"; + editedCabalFile = "055spdxxq97dg60pbdz3ldc7zzdb8b0cf3frpagbz98cvx5mxfsf"; libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; @@ -175942,6 +176639,8 @@ self: { pname = "iso-deriving"; version = "0.0.8"; sha256 = "1w9fvnyanzmxs7yab9qhf3k9qy1lik7y5y5gzfv3jrxzwm0hivbi"; + revision = "1"; + editedCabalFile = "1psk0w6y8vcy1kgzvasffzkdd412ky7svwslaycj0r8y47mghw7a"; libraryHaskellDepends = [ base mtl profunctors ]; testHaskellDepends = [ base mtl ]; description = "Deriving via arbitrary isomorphisms"; @@ -175996,8 +176695,8 @@ self: { }: mkDerivation { pname = "iso8601-duration"; - version = "0.1.1.0"; - sha256 = "0ypcs8nrgdnjibr15bgfxhms1h44dq2pgsagdjx70ipgawhmlywl"; + version = "0.1.2.0"; + sha256 = "1hzzcgc1k3dn4l5yxzqq9d62n2hfkrcg0ag14dly7ak3gx9l8l3n"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-lexing time ]; @@ -177022,24 +177721,22 @@ self: { "jacinda" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, deepseq, directory, filepath, happy, microlens - , microlens-mtl, mtl, optparse-applicative, prettyprinter - , recursion, regex-rure, silently, split, tasty, tasty-hunit, text - , transformers, vector + , criterion, deepseq, directory, filepath, happy, lazy-csv + , microlens, microlens-mtl, mtl, optparse-applicative + , prettyprinter, regex-rure, silently, split, tasty, tasty-hunit + , text, transformers, vector }: mkDerivation { pname = "jacinda"; - version = "3.0.2.0"; - sha256 = "0b18681ggx6syfix318j1wlycz3fm9g4r6p1vgqgfgxgv8kmyw9w"; - revision = "2"; - editedCabalFile = "12dnkgsf44wfcizdyd5z2l4hh4wg97cd816l909r9q70z2hszqpp"; + version = "3.1.1.1"; + sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath - microlens microlens-mtl mtl prettyprinter recursion regex-rure - split text transformers vector + lazy-csv microlens microlens-mtl mtl prettyprinter regex-rure split + text transformers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base optparse-applicative text ]; @@ -177105,22 +177802,23 @@ self: { "jackpolynomials" = callPackage ({ mkDerivation, array, base, combinat, containers, extra, hspray - , hypergeomatrix, ilist, lens, miniterion, numeric-prelude, tasty - , tasty-hunit, unordered-containers + , hypergeomatrix, ilist, lens, matrix, miniterion, numeric-prelude + , tasty, tasty-hunit, unordered-containers, vector }: mkDerivation { pname = "jackpolynomials"; - version = "1.4.1.0"; - sha256 = "153y4p18a5bz803il9v7nacsqki4mw1szw0pdx5qk9jyh9vnalkb"; + version = "1.4.4.0"; + sha256 = "1hrslf2x4dn7i2k9nh59p6kizw7mp9w6v59cj6nalp6amib9hsqg"; libraryHaskellDepends = [ - array base combinat containers extra hspray ilist lens - numeric-prelude unordered-containers + array base combinat containers extra hspray ilist lens matrix + numeric-prelude unordered-containers vector ]; testHaskellDepends = [ - base combinat containers hspray hypergeomatrix tasty tasty-hunit + base combinat containers hspray hypergeomatrix matrix + numeric-prelude tasty tasty-hunit unordered-containers ]; benchmarkHaskellDepends = [ base hspray miniterion ]; - description = "Jack, zonal, Schur and skew Schur polynomials"; + description = "Jack, zonal, Schur, and Hall-Littlewood polynomials"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -178067,6 +178765,25 @@ self: { broken = true; }) {inherit (pkgs) jdk;}; + "job" = callPackage + ({ mkDerivation, async, base, containers, hashable, mmzk-typeid + , random, resourcet, resourcet-extra, safe-exceptions, stm, time + , transformers + }: + mkDerivation { + pname = "job"; + version = "0.1.1"; + sha256 = "1zvsi7j9fv1wb6jam2gpzyh4ry2fbii5fdqfk2wdj8i266ggh27l"; + libraryHaskellDepends = [ + async base containers hashable mmzk-typeid resourcet + resourcet-extra safe-exceptions stm time transformers + ]; + testHaskellDepends = [ base random resourcet time ]; + description = "Job queue"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, fast-logger, HDBC @@ -178612,8 +179329,8 @@ self: { }: mkDerivation { pname = "jsaddle"; - version = "0.9.9.0"; - sha256 = "0vpd76wicdvybbvrj1v28mxkyagrisijfl0821wkv35k0lls4m9a"; + version = "0.9.9.2"; + sha256 = "0xifxq1mfx1wxcsy23h9lsq8qpnccrzq6v9qk7zfnj43ljfv9mav"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring containers deepseq exceptions filepath ghc-prim http-types lens @@ -178631,8 +179348,8 @@ self: { }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.9.0"; - sha256 = "0i2abhhfcg9dy767hx9h6si83syhxpnk7cgihadh2l3l7p4ykbgr"; + version = "0.9.9.2"; + sha256 = "1g34xam06kyvdr3dfmwrc0ybysj4kd2cyip0348kpf72yvbn5caf"; libraryHaskellDepends = [ aeson base base-compat bytestring data-default jsaddle text ]; @@ -178647,8 +179364,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.9.9.1"; - sha256 = "0gpr98p6wsj32vp029mdliclkkk5rf2bg6mv1jbkncskrvn40aqg"; + version = "0.9.9.2"; + sha256 = "0f2c95hagrabyb8s5bdyn1x6sbg5dzvzp23qhmyygi9cgp89nmf4"; libraryHaskellDepends = [ base base-compat exceptions jsaddle lens text transformers ]; @@ -178685,8 +179402,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.9.0"; - sha256 = "0kl296fw3f1fis4fzq9i4q23r0lgxil9bil2alfwnkv6yixj0mhs"; + version = "0.9.9.2"; + sha256 = "0pcswpx37i5gl70n75dlmqb57asya0ikjwyigklv6974yy9ryc9q"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -179105,25 +179822,6 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "2.0.0.11"; - sha256 = "0i8xandvxrh6almz70vkj8hln77j4mnbndy7izqknhzmbxk7ns4q"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = lib.licenses.mit; - }) {}; - - "json-feed_2_0_0_12" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; version = "2.0.0.12"; sha256 = "16rkzj280f735va17zl7lrp8yr1b8avjk9gqfa67pk31zn08yicc"; libraryHaskellDepends = [ @@ -179132,7 +179830,6 @@ self: { testHaskellDepends = [ base bytestring filepath hspec ]; description = "JSON Feed"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "json-fu" = callPackage @@ -179529,8 +180226,8 @@ self: { }: mkDerivation { pname = "json-spec"; - version = "0.4.0.0"; - sha256 = "07484bh8f9cnv60h5g0h1mgpic105cwq9v3m4pww57m8wg28a0sk"; + version = "0.5.0.0"; + sha256 = "1jdr9l8jvy4r11z6qxpicyafs48z792qkl24r20hddggq0kiac8z"; libraryHaskellDepends = [ aeson base containers scientific text time vector ]; @@ -179550,8 +180247,8 @@ self: { }: mkDerivation { pname = "json-spec-elm"; - version = "0.4.0.1"; - sha256 = "0gqlkb3zbkb46lf2bqa65ikj231qyi7kq59hys6vv3y13w3yq2ck"; + version = "0.4.0.2"; + sha256 = "1l49x5bzqra0s2xpf8azbq07kkj9zkqj0qya83bgyg1wrsnv0ivl"; libraryHaskellDepends = [ base bound containers elm-syntax json-spec mtl text ]; @@ -179563,22 +180260,23 @@ self: { "json-spec-elm-servant" = callPackage ({ mkDerivation, aeson, base, binary, bound, bytestring, containers - , cookie, directory, elm-syntax, hspec, http-types, json-spec - , json-spec-elm, mtl, prettyprinter, process, servant, text, time - , unordered-containers, uuid + , cookie, directory, elm-syntax, filepath, hspec, http-types + , json-spec, json-spec-elm, mtl, prettyprinter, process, servant + , text, time, unordered-containers, uuid }: mkDerivation { pname = "json-spec-elm-servant"; - version = "0.4.0.1"; - sha256 = "0smg0sx4mybfqycz99xpax3ia5qiwa17p14k87xmp793m6yyj2iq"; + version = "0.4.1.0"; + sha256 = "1l4gx5s8knf1f2s22qn4p8gnr8hbgys1b1pbcsmg0dvsac785871"; libraryHaskellDepends = [ - base bound containers elm-syntax http-types json-spec json-spec-elm - mtl servant text + base bound containers directory elm-syntax filepath http-types + json-spec json-spec-elm mtl prettyprinter process servant text + unordered-containers ]; testHaskellDepends = [ - aeson base binary bytestring containers cookie directory elm-syntax - hspec json-spec prettyprinter process servant text time - unordered-containers uuid + aeson base binary bound bytestring containers cookie directory + elm-syntax filepath hspec http-types json-spec json-spec-elm mtl + prettyprinter process servant text time unordered-containers uuid ]; description = "Generated elm code for servant APIs"; license = lib.licenses.mit; @@ -179591,8 +180289,8 @@ self: { }: mkDerivation { pname = "json-spec-openapi"; - version = "0.3.0.0"; - sha256 = "1wpf1lzpljczcxq0ml6yikh2xiysd1c5nl9zbscy3bsdcw1vwbgf"; + version = "0.3.1.0"; + sha256 = "0zypr3lxyqaywml7bkkvp00x4a6l4r8wggsplafvcvlanyz7b23i"; libraryHaskellDepends = [ aeson base insert-ordered-containers json-spec lens openapi3 text ]; @@ -181458,27 +182156,6 @@ self: { }: mkDerivation { pname = "katip-wai"; - version = "0.1.2.3"; - sha256 = "1b6rz18jcpxjhckpkknhj760np7xlml10hyfnk891agpgmlsii15"; - libraryHaskellDepends = [ - aeson base bytestring clock http-types katip network text uuid wai - ]; - testHaskellDepends = [ - aeson async base bytestring containers hspec http-client http-types - katip stm text uuid wai warp - ]; - testToolDepends = [ hspec-discover ]; - description = "WAI middleware for logging request and response info through katip"; - license = lib.licenses.bsd3; - }) {}; - - "katip-wai_0_1_2_4" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, clock, containers - , hspec, hspec-discover, http-client, http-types, katip, network - , stm, text, uuid, wai, warp - }: - mkDerivation { - pname = "katip-wai"; version = "0.1.2.4"; sha256 = "0vpjqdr4x68ffjzlwj5f7vhslkwqybj95ynvj8ap9fhq0nhmmp3q"; libraryHaskellDepends = [ @@ -181491,7 +182168,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "WAI middleware for logging request and response info through katip"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "katt" = callPackage @@ -181760,6 +182436,29 @@ self: { broken = true; }) {}; + "kdt_0_2_6" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , deepseq-generics, heap, mersenne-random-pure64, MonadRandom + , QuickCheck + }: + mkDerivation { + pname = "kdt"; + version = "0.2.6"; + sha256 = "055chna3q37986mds4f4gdp8ydnw7vviikrmihnf1q4savq14iv1"; + libraryHaskellDepends = [ base deepseq deepseq-generics heap ]; + testHaskellDepends = [ + base containers deepseq deepseq-generics QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics heap mersenne-random-pure64 + MonadRandom QuickCheck + ]; + description = "Fast and flexible k-d trees for various types of point queries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "keccak" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , gauge, HUnit, memory, parsec, QuickCheck, quickcheck-instances @@ -182376,8 +183075,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.13"; - sha256 = "0r2kskw5hpl9pkfl4r8c2p5wkzhy922rl8l7fla017iw3h1v6y8s"; + version = "0.2.0.14"; + sha256 = "056pvzywdwgya6i43i05kq81r0f91y6cxa0lmx825dzkfm7x7851"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -182491,6 +183190,47 @@ self: { mainProgram = "keter"; }) {}; + "keter_2_1_6" = callPackage + ({ mkDerivation, aeson, array, async, attoparsec, base + , blaze-builder, bytestring, case-insensitive, conduit + , conduit-extra, containers, directory, fast-logger, filepath + , fsnotify, http-client, http-conduit, http-reverse-proxy + , http-types, HUnit, indexed-traversable, lens, lifted-base + , monad-logger, mtl, network, optparse-applicative, process, random + , regex-tdfa, stm, tar, tasty, tasty-hunit, template-haskell, text + , time, tls, tls-session-manager, transformers, unix, unix-compat + , unliftio-core, unordered-containers, vector, wai, wai-app-static + , wai-extra, warp, warp-tls, wreq, yaml, zlib + }: + mkDerivation { + pname = "keter"; + version = "2.1.6"; + sha256 = "0qvvisccf3w35lq4856z3ppsmf44xf9bzfc2x46p96r8k1irgfg8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async attoparsec base blaze-builder bytestring + case-insensitive conduit conduit-extra containers directory + fast-logger filepath fsnotify http-client http-conduit + http-reverse-proxy http-types indexed-traversable lifted-base + monad-logger mtl network optparse-applicative process random + regex-tdfa stm tar template-haskell text time tls + tls-session-manager transformers unix unix-compat unliftio-core + unordered-containers vector wai wai-app-static wai-extra warp + warp-tls yaml zlib + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit http-client http-conduit http-types HUnit + lens monad-logger mtl stm tasty tasty-hunit transformers unix wai + warp wreq + ]; + description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime."; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "keter"; + }) {}; + "keuringsdienst" = callPackage ({ mkDerivation, aeson, base, containers, HUnit, text }: mkDerivation { @@ -182777,7 +183517,6 @@ self: { ]; description = "back up a secret key securely to the cloud"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; mainProgram = "keysafe"; }) {}; @@ -184029,7 +184768,6 @@ self: { ]; description = "Key/Value Indexed Table container and formatting library"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "kyotocabinet" = callPackage @@ -184217,25 +184955,12 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "2.0.0.7"; - sha256 = "08i4hg2m6d1s6fbgpjnd010ahgfa2d9i5m42pnnd2cr2rkan5f13"; - libraryHaskellDepends = [ base servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = lib.licenses.mit; - }) {}; - - "lackey_2_0_0_8" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; version = "2.0.0.8"; sha256 = "1lqvy29zcqmmv7bvrprriip5537j73j8zfbwl505a9b17ym97sr7"; libraryHaskellDepends = [ base servant-foreign text ]; testHaskellDepends = [ base hspec servant text ]; description = "Generate Ruby clients from Servant APIs"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lacroix" = callPackage @@ -185532,8 +186257,8 @@ self: { pname = "language-c-quote"; version = "0.13.0.1"; sha256 = "0ik16ng210fa0l93bgiwpw9m1krcw23530fvv5agl9j1b71qaxm0"; - revision = "1"; - editedCabalFile = "0skpnzjdrfadd1b835q5ic7pvl0znx1mkyxkimy99zm474rn3dzj"; + revision = "2"; + editedCabalFile = "0zjc91j2s5l7arpzk46554sgcdhrl68ni7r04p1nlqkqbgzwyb8a"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -185672,8 +186397,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.4.3.0"; - sha256 = "18idkxx2mh62qfymqwbfmzf3k0zvx3wgijk73iqpfbw43wqn99ls"; + version = "1.4.3.1"; + sha256 = "03fj2ddrim37kcqbixjdypawn6v4i4vy3qjrcqy78amymvc9br2m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185932,8 +186657,8 @@ self: { pname = "language-gemini"; version = "0.1.0.1"; sha256 = "1vnl280ld0wazffzx19an5d6gybx4396z57idcfvdvzkap97qbh9"; - revision = "1"; - editedCabalFile = "0a3ah5y4nadgdy7jhaa8yswm0hcwq8mzvy25nr1z02garkx8382f"; + revision = "2"; + editedCabalFile = "0z1i9i3w6ymlhaa4r8fs6iks94rwx25zwwrk1gkyczhv1ah1vaqi"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base hedgehog hspec hspec-hedgehog text ]; description = "Datatypes and parsing/printing functions to represent the Gemini markup language"; @@ -186792,37 +187517,6 @@ self: { "lapack" = callPackage ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms - , comfort-array, comfort-array-shape, comfort-blas, data-ref - , deepseq, doctest-exitcode-stdio, guarded-allocation, hyper - , lapack-ffi, lazyio, monoid-transformer, netlib-ffi, non-empty - , QuickCheck, quickcheck-transformer, random, semigroups, Stream - , tagged, text, tfp, transformers, unique-logic-tf, utility-ht - }: - mkDerivation { - pname = "lapack"; - version = "0.5.1.1"; - sha256 = "1fcg43anw1ig861f20p7654gf8g4i2yb2rnld3q22gyi6s5bmi75"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blas-ffi blaze-html boxes comfort-array comfort-array-shape - comfort-blas deepseq guarded-allocation hyper lapack-ffi lazyio - netlib-ffi non-empty semigroups Stream tagged text tfp transformers - utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms comfort-array comfort-array-shape data-ref - doctest-exitcode-stdio monoid-transformer netlib-ffi non-empty - QuickCheck quickcheck-transformer random semigroups tfp - transformers unique-logic-tf utility-ht - ]; - description = "Numerical Linear Algebra using LAPACK"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "lapack_0_5_2" = callPackage - ({ mkDerivation, base, blas-ffi, blaze-html, boxes, ChasingBottoms , comfort-array, comfort-array-shape, comfort-blas, containers , data-ref, deepseq, doctest-exitcode-stdio, guarded-allocation , hyper, lapack-ffi, lazyio, monoid-transformer, netlib-ffi @@ -186850,7 +187544,6 @@ self: { ]; description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -187328,32 +188021,6 @@ self: { }) {}; "lattices" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , integer-logarithms, QuickCheck, quickcheck-instances, tagged - , tasty, tasty-quickcheck, transformers, universe-base - , universe-reverse-instances, unordered-containers - }: - mkDerivation { - pname = "lattices"; - version = "2.2"; - sha256 = "1hwm290bzmiv83hms5lkmgsx64lflr1jp49mz61gg4xnw2sp9v7y"; - revision = "1"; - editedCabalFile = "1q7kl6lxk47lchbmgx15690akggdshvjjhdvmwzfj3hqgwgzjjyi"; - libraryHaskellDepends = [ - base base-compat containers deepseq hashable integer-logarithms - QuickCheck tagged transformers universe-base - universe-reverse-instances unordered-containers - ]; - testHaskellDepends = [ - base base-compat containers QuickCheck quickcheck-instances tasty - tasty-quickcheck transformers universe-base - universe-reverse-instances unordered-containers - ]; - description = "Fine-grained library for constructing and manipulating lattices"; - license = lib.licenses.bsd3; - }) {}; - - "lattices_2_2_1" = callPackage ({ mkDerivation, base, containers, deepseq, hashable , integer-logarithms, QuickCheck, quickcheck-instances, tagged , tasty, tasty-quickcheck, transformers, universe-base @@ -187375,7 +188042,6 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "launchdarkly-server-sdk" = callPackage @@ -187619,19 +188285,19 @@ self: { }) {}; "layers-game" = callPackage - ({ mkDerivation, base, cmdargs, composition, data-lens, Gamgine - , GLFW-b, ListZipper, mtl, OpenGLRaw, pretty-show + ({ mkDerivation, base, cmdargs, composition, data-lens-light + , Gamgine, GLFW-b, ListZipper, mtl, OpenGLRaw, pretty-show }: mkDerivation { pname = "layers-game"; - version = "0.7.0"; - sha256 = "1v55940lpp9p67nnnqslzz175cbzs7sfdyinxws9dhwmjvpm4ix8"; + version = "0.8.0"; + sha256 = "17chcw2m3xrn2wmls5k9m2mkdwjqbqphsipbgihskbsq6jmplyc9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl - OpenGLRaw pretty-show + base cmdargs composition data-lens-light Gamgine GLFW-b ListZipper + mtl OpenGLRaw pretty-show ]; description = "A prototypical 2d platform game"; license = lib.licenses.bsd3; @@ -188052,21 +188718,20 @@ self: { "ldap-client" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring - , connection, containers, fail, hspec, network, process, semigroups - , stm, text + , containers, crypton-connection, fail, hspec, network, process + , semigroups, stm, text }: mkDerivation { pname = "ldap-client"; - version = "0.4.2"; - sha256 = "025k631wlg6g6fcsxq403k7wn7cnqbk77w7vpmm87sngvk0i4q0v"; + version = "0.4.3"; + sha256 = "15cid7mnfn6ykh4vhhqbs652sng12430ccdabf6kcc0236ghicrd"; libraryHaskellDepends = [ - asn1-encoding asn1-types async base bytestring connection - containers fail network semigroups stm text + asn1-encoding asn1-types async base bytestring containers + crypton-connection fail network semigroups stm text ]; testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ldap-client-og" = callPackage @@ -189767,8 +190432,8 @@ self: { ({ mkDerivation, base, deepseq, hashable, tasty, tasty-hunit }: mkDerivation { pname = "libBF"; - version = "0.6.7"; - sha256 = "0kdazhqxn3wr6mi20qwlkn6n5vl9sviij0p141svs77zpc3cxk09"; + version = "0.6.8"; + sha256 = "02lfs9l5qx0xgcy997c31kkmldy26442ahbwiaap9ri85w9j306r"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A binding to the libBF library"; @@ -190273,8 +190938,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.10.0.0"; - sha256 = "088vlir0n3wps2p5ydgyx51p41nfjcm2v02sszpyjj3c8z7f4qkh"; + version = "0.10.0.1"; + sha256 = "0ca3ispg92aj49fjzg5ykv7ggvdzb8lsvrh8rfh6fbnivqyzqn56"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network safe-exceptions text time utf8-string @@ -190662,6 +191327,18 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) libsodium;}; + "libssh" = callPackage + ({ mkDerivation, base, bytestring, libssh }: + mkDerivation { + pname = "libssh"; + version = "0.1.0.0"; + sha256 = "17i6yqa9705wv91q3y2li3zaan1kc71c9nmfgmz1k0zhq172z36n"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ libssh ]; + description = "libssh bindings"; + license = lib.licenses.mit; + }) {inherit (pkgs) libssh;}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb , time, unix @@ -191868,8 +192545,8 @@ self: { pname = "linear-generics"; version = "0.2.3"; sha256 = "0093ywl8s8k92b50li28gcmqc616f6l7jkv7vslkvqzn42yrvbq2"; - revision = "1"; - editedCabalFile = "1ky9dhc0bjymw12wpjcv12drbfz7955f1nchgcs3l0ghv8vyvy3x"; + revision = "2"; + editedCabalFile = "0qicg4wh00zph3dih63rkx97fbda4kdyp78xnra0589ry9axbxry"; libraryHaskellDepends = [ base containers ghc-prim template-haskell th-abstraction ]; @@ -193172,23 +193849,6 @@ self: { }: mkDerivation { pname = "list-shuffle"; - version = "1.0.0"; - sha256 = "03qvms9z3jrcz1lswb6kzyk8bw9gafmkz5yil7vi3jirhxxq7491"; - libraryHaskellDepends = [ base primitive random ]; - testHaskellDepends = [ base hedgehog random ]; - benchmarkHaskellDepends = [ base deepseq random tasty-bench ]; - description = "List shuffling and sampling"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "list-shuffle_1_0_0_1" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, primitive, random - , tasty-bench - }: - mkDerivation { - pname = "list-shuffle"; version = "1.0.0.1"; sha256 = "1qcgkkhwnbrl729va8zgv5k6b4lpfy15bbkqnnx0nqz0d91xiqcr"; libraryHaskellDepends = [ base primitive random ]; @@ -193333,26 +193993,12 @@ self: { ({ mkDerivation, base, doctest, mmorph, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.1.0"; - sha256 = "061a2cnlv335ski627zrdfk8nd110wpiawclq5nwa3sx0l92xsrx"; - libraryHaskellDepends = [ base mmorph mtl ]; - testHaskellDepends = [ base doctest ]; - description = "List monad transformer"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.Gabriella439 ]; - }) {}; - - "list-transformer_1_1_1" = callPackage - ({ mkDerivation, base, doctest, mmorph, mtl }: - mkDerivation { - pname = "list-transformer"; version = "1.1.1"; sha256 = "172dmmw2hbmgzym2fdllwdnk5kcwrw8ljks6azpyzz99ppzk6gr0"; libraryHaskellDepends = [ base mmorph mtl ]; testHaskellDepends = [ base doctest ]; description = "List monad transformer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.Gabriella439 ]; }) {}; @@ -193595,8 +194241,8 @@ self: { pname = "literatex"; version = "0.3.0.0"; sha256 = "0ph3s26hxvnkdqc3s09d3ka1p224zmgwc3k6zi7jmma0sgrmnm9x"; - revision = "7"; - editedCabalFile = "0w03xl8i6j47li8cp0issjf6k2n5kwkhp461pp5spsw0hkb4gl3i"; + revision = "8"; + editedCabalFile = "0wg9kshyn0s8f65pchyl69i97qdk39lr8fzp9c4zb7d2lv1cgn8c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195157,6 +195803,8 @@ self: { pname = "logging-effect"; version = "1.4.0"; sha256 = "0ff794800pn4gxdig85nr2svajph01rdg3sm0vjpfa71q67wlq0q"; + revision = "1"; + editedCabalFile = "0yjlwlc4rybygpbksclid3wskp5ng8gwwwrh8frq6vl08d1rwmf7"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -196463,28 +197111,25 @@ self: { license = lib.licenses.mit; }) {}; - "lsp_2_6_0_0" = callPackage + "lsp_2_7_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , extra, filepath, hashable, hspec, hspec-discover, lens - , lens-aeson, lsp-types, mtl, prettyprinter, random, sorted-list - , stm, text, text-rope, transformers, unliftio, unliftio-core - , unordered-containers, uuid + , lens-aeson, lsp-types, mtl, prettyprinter, sorted-list, stm, text + , text-rope, transformers, unliftio, unliftio-core + , unordered-containers }: mkDerivation { pname = "lsp"; - version = "2.6.0.0"; - sha256 = "1wimb5y1757l8k1kinlv1y43n7kmjzdh18gayarfm32dsmllahi5"; - revision = "1"; - editedCabalFile = "1p9lvb18m69jdz99d8bn59h2dn3gwalnf4j0sf7j1p2cj9yv8srm"; + version = "2.7.0.0"; + sha256 = "1vxyl3p4b4nskl4icvw5087683lbr5zjj64wwmckw3l2hgvqwr6j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring co-log-core containers data-default directory exceptions extra filepath hashable lens - lens-aeson lsp-types mtl prettyprinter random sorted-list stm text + lens-aeson lsp-types mtl prettyprinter sorted-list stm text text-rope transformers unliftio unliftio-core unordered-containers - uuid ]; testHaskellDepends = [ base containers hspec sorted-list text text-rope @@ -196519,8 +197164,6 @@ self: { ]; description = "Haskell library for Language Server Protocol clients"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "lsp-test" = callPackage @@ -196555,7 +197198,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_17_0_2" = callPackage + "lsp-test_0_17_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, co-log-core, conduit, conduit-parse, containers , data-default, Diff, directory, exceptions, extra, filepath, Glob @@ -196564,10 +197207,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.17.0.2"; - sha256 = "1nyqv66rqs316dx1yl1n3ydcxl1lkdvxri8chgvw88c67p84ss45"; - revision = "1"; - editedCabalFile = "04pr949939z5wpi5ir4pjks8zx1r99pgrb4f7wxqpm1g0l25vzgx"; + version = "0.17.1.0"; + sha256 = "1yirmmb4nich63mgxhs51ib5gbp42qi6dmycl38rw4x7lclf82nx"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring co-log-core conduit conduit-parse containers data-default Diff directory @@ -196659,20 +197300,18 @@ self: { mainProgram = "generator"; }) {}; - "lsp-types_2_2_0_0" = callPackage + "lsp-types_2_3_0_0" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath - , generic-arbitrary, hashable, hspec, hspec-discover + , generic-arbitrary, hashable, hspec, hspec-discover, hspec-golden , indexed-traversable, indexed-traversable-instances, lens, mod , mtl, network-uri, prettyprinter, QuickCheck, quickcheck-instances , regex, row-types, safe, some, template-haskell, text, witherable }: mkDerivation { pname = "lsp-types"; - version = "2.2.0.0"; - sha256 = "0h3mdnilhk6mg4vnhmnynq18vhj9kfbw5k9bsqa7mrgr8rjsy7jy"; - revision = "1"; - editedCabalFile = "05rz0q5w8ijac7ciia06lcdim6lycq3y5ni5kl7fbjhp39z9l11g"; + version = "2.3.0.0"; + sha256 = "1w5yrcya1yhdg0f4j4yiy0a1lx2ivyjabzkm814ncgs8g99pb8vs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196687,8 +197326,8 @@ self: { witherable ]; testHaskellDepends = [ - aeson base filepath hspec lens network-uri QuickCheck - quickcheck-instances text + aeson base filepath hspec hspec-golden lens network-uri + prettyprinter QuickCheck quickcheck-instances text ]; testToolDepends = [ hspec-discover ]; doHaddock = false; @@ -197122,8 +197761,8 @@ self: { ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { pname = "lucid-svg"; - version = "0.7.1.1"; - sha256 = "16yijfnbm58cw8b2bfx10xnn55z96xjdhjd488a76ypcfl2qzfrd"; + version = "0.7.2.0"; + sha256 = "166a6sfwsgmppi8d07xbfrazschfb01qa1nml8vnn5vvj8sxv1z8"; libraryHaskellDepends = [ base blaze-builder lucid text transformers ]; @@ -197288,6 +197927,24 @@ self: { license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; + "lukko_0_1_2" = callPackage + ({ mkDerivation, async, base, bytestring, filepath, singleton-bool + , tasty, tasty-expected-failure, tasty-hunit, temporary + }: + mkDerivation { + pname = "lukko"; + version = "0.1.2"; + sha256 = "0vcqds8ihpjw6zv5rxdzzykh05wayx376wvz77s63d15ls56zn3j"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + async base bytestring filepath singleton-bool tasty + tasty-expected-failure tasty-hunit temporary + ]; + description = "File locking"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + }) {}; + "lumberjack" = callPackage ({ mkDerivation, base, contravariant, exceptions, mtl , prettyprinter, prettyprinter-ansi-terminal, text, time @@ -197689,19 +198346,17 @@ self: { }) {}; "lzma" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck, xz + ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, xz }: mkDerivation { pname = "lzma"; - version = "0.0.1.0"; - sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; - revision = "1"; - editedCabalFile = "0k1f4qy46m4z9phbifasi4x6sjcld2zr45hsawbyb0az9y8p2vnd"; + version = "0.0.1.1"; + sha256 = "1wfwxa927607kfqy9qs8lxm11gngl3ikwwwm0d7i3km2j612g9c0"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ xz ]; testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; @@ -198670,8 +199325,8 @@ self: { pname = "mainland-pretty"; version = "0.7.1"; sha256 = "19z2769rik6kwvsil2if2bfq2v59jmwv74jy3fy4q3q3zy4239p1"; - revision = "3"; - editedCabalFile = "0wspwmy0wi1fcyw8czgkr03iyq73gg4i0x6ckjbhxq7qb3r62q8v"; + revision = "4"; + editedCabalFile = "1prij4hi17mmx3b3ws533ps5c0p6qn07qi0hxlk8qx5rqyww6y1w"; libraryHaskellDepends = [ base containers srcloc text transformers ]; @@ -199569,34 +200224,6 @@ self: { }: mkDerivation { pname = "mappings"; - version = "0.3.0.0"; - sha256 = "0ljjai9b46d6gsd1w99daincnvs0ckbx81z3y2z1sljn7nay88np"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cond containers formatting indexed-traversable partialord - ]; - executableHaskellDepends = [ - base cond containers formatting indexed-traversable partialord - ]; - testHaskellDepends = [ - base cond containers formatting hspec indexed-traversable - partialord - ]; - testToolDepends = [ hspec-discover ]; - description = "Types which represent functions k -> v"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "view"; - broken = true; - }) {}; - - "mappings_0_3_1_0" = callPackage - ({ mkDerivation, base, cond, containers, formatting, hspec - , hspec-discover, indexed-traversable, partialord - }: - mkDerivation { - pname = "mappings"; version = "0.3.1.0"; sha256 = "1yf6qvsipjfq8s9z9lk7q29m3dkpa5kgvjpkm4wap5vawp2rzqyd"; isLibrary = true; @@ -200381,6 +201008,22 @@ self: { mainProgram = "mastermind"; }) {}; + "matcha" = callPackage + ({ mkDerivation, base, http-api-data, http-types, text, wai }: + mkDerivation { + pname = "matcha"; + version = "0.0.0.1"; + sha256 = "15s031ks4ih6ic2mvhx8dfcnkg0x3yaz347gyxbbrywjkn0826sv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base http-api-data http-types text wai ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "A micro web framework based on pattern matching"; + license = lib.licenses.bsd3; + mainProgram = "matcha-exe"; + }) {}; + "matchable" = callPackage ({ mkDerivation, base, containers, hashable, hspec, tagged , unordered-containers, vector @@ -204876,6 +205519,7 @@ self: { ]; description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "minions" = callPackage @@ -205002,12 +205646,12 @@ self: { ({ mkDerivation, base, deepseq, directory, tasty, tasty-hunit }: mkDerivation { pname = "miniterion"; - version = "0.1.1.0"; - sha256 = "0byjlkmi6hr5wpqfbcmqyz7yzcs5nw7gc3x3878a32f9jz92a8jr"; + version = "0.1.1.1"; + sha256 = "1gz00kydz4zdmd0cvfjk1s68mvcmrcdp7h6y4vhp2whqcaiyyppl"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base directory tasty tasty-hunit ]; benchmarkHaskellDepends = [ base ]; - description = "Simple and lightweight benchmark utilities"; + description = "Simple and lightweight benchmarking utilities"; license = lib.licenses.mit; }) {}; @@ -205706,6 +206350,7 @@ self: { benchmarkHaskellDepends = [ base criterion text weigh ]; description = "Strict markdown processor for writers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "mmark-cli" = callPackage @@ -205747,6 +206392,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Commonly useful extensions for the MMark markdown processor"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "mmorph_1_1_3" = callPackage @@ -206086,8 +206732,8 @@ self: { }: mkDerivation { pname = "mmzk-typeid"; - version = "0.6.0.1"; - sha256 = "0dcwa97whwwk267cvbmvixya465v7hyc45i0s1jvgxqjhmpy3p6d"; + version = "0.6.3.0"; + sha256 = "02sycvlvwrlx2lvsisldp4vxs6adiq414ihv1cjbxwm6i7z0avb4"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types @@ -206096,7 +206742,7 @@ self: { aeson array base binary bytestring containers entropy hashable hspec random text time uuid uuid-types ]; - description = "A TypeID implementation for Haskell"; + description = "A TypeID and UUIDv7 implementation for Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -206324,8 +206970,8 @@ self: { pname = "modern-uri"; version = "0.3.6.1"; sha256 = "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2"; - revision = "1"; - editedCabalFile = "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q"; + revision = "2"; + editedCabalFile = "1wr2c7rymb3xbs9vzkhk7xz2msh74riqx2clyfm78wpfbdzga0xa"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions hashable megaparsec mtl profunctors QuickCheck reflection tagged template-haskell text @@ -206889,8 +207535,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.3.0.1"; - sha256 = "1dlafvvf087l9afdyvwl9zhza9ycccgd30jgd2230ak30hwbvgmk"; + version = "1.3.0.2"; + sha256 = "0w25h6dal72p9y2wn639095g6h78a0sv2p7qbvxsf4rybdwd7j65"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -206980,24 +207626,6 @@ self: { }: mkDerivation { pname = "monad-chronicle"; - version = "1.0.1"; - sha256 = "13f1qwylpj7wss2h5g69zlmn6k6qg5r3aqd9zhvjspg1a85m91kq"; - revision = "3"; - editedCabalFile = "1piiyqm671grd7kwn9l1ks92sdr62kbf8jxq9w05d72s3m050ygi"; - libraryHaskellDepends = [ - base data-default-class mtl semigroupoids these transformers - transformers-compat - ]; - description = "These as a transformer, ChronicleT"; - license = lib.licenses.bsd3; - }) {}; - - "monad-chronicle_1_0_2" = callPackage - ({ mkDerivation, base, data-default-class, mtl, semigroupoids - , these, transformers, transformers-compat - }: - mkDerivation { - pname = "monad-chronicle"; version = "1.0.2"; sha256 = "1mmp2r75b3j9l0rvxjvl1znlr7x4d8baj6ykffdsbnf9v59h0dcx"; libraryHaskellDepends = [ @@ -207006,7 +207634,6 @@ self: { ]; description = "These as a transformer, ChronicleT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monad-classes" = callPackage @@ -207935,6 +208562,29 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; + "monad-schedule_0_2" = callPackage + ({ mkDerivation, base, free, generic-arbitrary, HUnit, operational + , QuickCheck, stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, time-domain, transformers + }: + mkDerivation { + pname = "monad-schedule"; + version = "0.2"; + sha256 = "1cwypy31hn49afq7dr8ahvw687j97xyjg8l8g30ss379g3fm3y2k"; + libraryHaskellDepends = [ + base free operational stm time-domain transformers + ]; + testHaskellDepends = [ + base free generic-arbitrary HUnit operational QuickCheck stm + test-framework test-framework-hunit test-framework-quickcheck2 time + time-domain transformers + ]; + description = "A new, simple, composable concurrency abstraction"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.turion ]; + }) {}; + "monad-skeleton" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -208364,8 +209014,8 @@ self: { }: mkDerivation { pname = "monadic-bang"; - version = "0.2.1.0"; - sha256 = "1kridaswa219y6gchfg50q0chm8gngk7clyjxnpz3hhls2v45pj6"; + version = "0.2.2.1"; + sha256 = "1map2ywq3inzqki6fkw8f5frx85cic1c06ccyy3p0laahlz8i1z8"; libraryHaskellDepends = [ base containers fused-effects ghc transformers ]; @@ -208996,27 +209646,6 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.2.5"; - sha256 = "17i07i5z4jhk7w35123hkikrl81v7vnp4qd8plci90vfix53z5aa"; - libraryHaskellDepends = [ - base bytestring commutative-semigroups containers primes text - vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - description = "Subclasses of Monoid"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_1_2_5_1" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, primes, QuickCheck, quickcheck-instances, tasty - , tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; version = "1.2.5.1"; sha256 = "0xrbsk4cd8gncw8s0wdg02pmds8wxf237qkbncr73wfwbidshl15"; libraryHaskellDepends = [ @@ -209029,7 +209658,6 @@ self: { ]; description = "Subclasses of Monoid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -209050,10 +209678,8 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.6.4.0"; - sha256 = "09sg4gsrvgnsy12819sps2l0j97baanbsq2w1pvypnrkanzrw083"; - revision = "2"; - editedCabalFile = "0k0pi43km8v25rz61zqfw958djbxrrjb1a2idkpj92klbjsr49dd"; + version = "0.6.5.0"; + sha256 = "008icgq7704pk301s6224k24iy3n60h0jvkkqgq61fi2fbbdy5r7"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign these unordered-containers witherable @@ -209740,8 +210366,8 @@ self: { }) {}; "morpheus-graphql" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , morpheus-graphql-app, morpheus-graphql-code-gen + ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring + , containers, morpheus-graphql-app, morpheus-graphql-code-gen , morpheus-graphql-core, morpheus-graphql-server , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl , relude, tasty, tasty-hunit, template-haskell, text, transformers @@ -209749,21 +210375,22 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.27.3"; - sha256 = "04qah7565dzq7v4q43zjz8778pdn5jwnway5rvz4kkibcrscfagn"; + version = "0.28.1"; + sha256 = "0i4ax49plhms3rxb4b8p5w97r01i8baqjjnkzg0if0xsvsp1hs3s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server mtl relude template-haskell text - transformers unordered-containers vector + aeson attoparsec-aeson base bytestring containers + morpheus-graphql-app morpheus-graphql-code-gen + morpheus-graphql-core morpheus-graphql-server mtl relude + template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers morpheus-graphql-app - morpheus-graphql-code-gen morpheus-graphql-core - morpheus-graphql-server morpheus-graphql-subscriptions - morpheus-graphql-tests mtl relude tasty tasty-hunit - template-haskell text transformers unordered-containers vector + aeson attoparsec-aeson base bytestring containers + morpheus-graphql-app morpheus-graphql-code-gen + morpheus-graphql-core morpheus-graphql-server + morpheus-graphql-subscriptions morpheus-graphql-tests mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers vector ]; description = "Morpheus GraphQL"; license = lib.licenses.mit; @@ -209797,6 +210424,35 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-app_0_28_1" = callPackage + ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring + , containers, directory, hashable, megaparsec + , morpheus-graphql-core, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.28.1"; + sha256 = "1fdxz6fny43nrb2cfd57br61v0kc9ijl039p8951xbv3b2c8fjrh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson attoparsec-aeson base bytestring containers hashable + megaparsec morpheus-graphql-core mtl relude scientific + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec-aeson base bytestring containers directory + hashable megaparsec morpheus-graphql-core morpheus-graphql-tests + mtl relude scientific tasty tasty-hunit template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + description = "Morpheus GraphQL App"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -209851,6 +210507,38 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, modern-uri, morpheus-graphql-code-gen-utils + , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl + , prettyprinter, relude, req, tasty, tasty-hunit, template-haskell + , text, transformers, unliftio-core, unordered-containers + , websockets, wuss + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.28.1"; + sha256 = "18kifpxqbnvbw4842d1v1wgfsjic0w91rc2ly02kgj302a2lhgp0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req + template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req tasty + tasty-hunit template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-code-gen" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, filepath , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils @@ -209860,8 +210548,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.27.3"; - sha256 = "1rmxcr17xjx99aam048a4sqlwlnxjk41hx8fnb363ljid74vrcrb"; + version = "0.28.1"; + sha256 = "0nlqhfb5h6rhkg7f85cz8q6jskijqf1ddqic5hcfd5d8myfh6xkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -209901,6 +210589,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "morpheus-graphql-code-gen-utils_0_28_1" = callPackage + ({ mkDerivation, base, bytestring, containers + , morpheus-graphql-core, mtl, prettyprinter, relude + , template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-code-gen-utils"; + version = "0.28.1"; + sha256 = "0ficavdkml1cbw9rkdgljpgcfsx819116djc86fbdhxglaz1afpd"; + libraryHaskellDepends = [ + base bytestring containers morpheus-graphql-core mtl prettyprinter + relude template-haskell text unordered-containers + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-tests, mtl, relude @@ -209927,6 +210633,33 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.28.1"; + sha256 = "0z47wcqhpm2mz0v5168s9pd03f40as1kl8mnyvzp29c15wf2qmay"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-tests mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-server" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , morpheus-graphql-app, morpheus-graphql-core @@ -209954,6 +210687,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-server_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , morpheus-graphql-app, morpheus-graphql-core + , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-server"; + version = "0.28.1"; + sha256 = "1pghahv73d8cjqmxi7xndlq8g68f0ap5gn3yk9ww25zjp8vwwsgw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed morpheus-graphql-app + morpheus-graphql-core morpheus-graphql-subscriptions + morpheus-graphql-tests mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app , morpheus-graphql-core, mtl, relude, text, transformers @@ -209972,6 +210733,25 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app + , morpheus-graphql-core, mtl, relude, text, transformers + , unliftio-core, unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.28.1"; + sha256 = "10bvy586a0ldyfld2xhzprsrgd7rdvcwpcnbg460l0hqmzgpkcr2"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers @@ -209988,6 +210768,23 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-tests_0_28_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-tests"; + version = "0.28.1"; + sha256 = "161qazf4g7plkx68rnf56sjzrdx5j9k31kdwpynmpb117ylvvrmf"; + libraryHaskellDepends = [ + aeson base bytestring directory relude tasty tasty-hunit text + unordered-containers + ]; + description = "Morpheus GraphQL Test"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -212341,8 +213138,8 @@ self: { pname = "multipart"; version = "0.2.1"; sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn"; - revision = "1"; - editedCabalFile = "03gaapwnvn843hpm5qwdci9df1wf383msd42p8w9ghilpfjj4qy9"; + revision = "2"; + editedCabalFile = "0nansxxrd6153bwwm825iarsxqgyhx924spvx5rrd2i1spp0972m"; libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "Parsers for the HTTP multipart format"; license = lib.licenses.bsd3; @@ -214982,8 +215779,8 @@ self: { }: mkDerivation { pname = "national-australia-bank"; - version = "0.0.8"; - sha256 = "1z4bdd8xwxivb4n07jxgk905r8vk1zhg9ik6k3rqqd5rlc0xa0di"; + version = "0.0.11"; + sha256 = "1bhnzsbxcl6mrcka9vibclria5650hnsrlyj21yfbww55klg6nh8"; libraryHaskellDepends = [ base bytestring containers digit directory filepath lens mtl parsec sv time transformers utf8-string validation @@ -216126,24 +216923,6 @@ self: { }) {}; "netlib-ffi" = callPackage - ({ mkDerivation, base, guarded-allocation, storable-complex - , transformers - }: - mkDerivation { - pname = "netlib-ffi"; - version = "0.1.1"; - sha256 = "0irf5gc9kw3pjb339nrzylr1ldz8fhgmpkji26dm3w18vkwic411"; - revision = "1"; - editedCabalFile = "0q5psp0gi0il6yz99sxmq7x3m7axwzh2qbimcvqbw623zbzgycyg"; - libraryHaskellDepends = [ - base guarded-allocation storable-complex transformers - ]; - description = "Helper modules for FFI to BLAS and LAPACK"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.thielema ]; - }) {}; - - "netlib-ffi_0_1_2" = callPackage ({ mkDerivation, base, deepseq, guarded-allocation , storable-complex, transformers }: @@ -216156,7 +216935,6 @@ self: { ]; description = "Helper modules for FFI to BLAS and LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -216643,8 +217421,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "1.0.0.0"; - sha256 = "00h1qwnk2clybf06d172pjmf87qb7jwsdn2l1a08hszq1pxyb9ch"; + version = "1.0.0.1"; + sha256 = "0mnyl7rsy30n21kn8h6v1lz73figc1d7b6bljvcas63izymjy8wq"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -217259,6 +218037,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "network-run_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, network, time-manager }: + mkDerivation { + pname = "network-run"; + version = "0.3.1"; + sha256 = "0bi7iqlcziw12amqwcirm7jmi007yl4z4xq8zjzp5i989aan0yq9"; + libraryHaskellDepends = [ base bytestring network time-manager ]; + description = "Simple network runner library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "network-server" = callPackage ({ mkDerivation, base, network, unix }: mkDerivation { @@ -217437,6 +218227,8 @@ self: { pname = "network-transport"; version = "0.5.7"; sha256 = "163n3dl56vrmw4pdq66lb80ybjh58lqr85j69hpqwr24c46gjqk7"; + revision = "1"; + editedCabalFile = "1z9k8i5j01ajhashmy1kkwq6bqcwvi48j6d3n57i4bglfdz8s31z"; libraryHaskellDepends = [ base binary bytestring deepseq hashable transformers ]; @@ -218268,8 +219060,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.7.10"; - sha256 = "15hd1hknhkcpg8x8h7fb6azcgazyxbxggsxrqm441a80yvphq81s"; + version = "1.7.10.1"; + sha256 = "1gzyygw3l434s7kb5iqj6maxrwrnlx5fw1jiir14zdq6p3vafnp8"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -218342,15 +219134,15 @@ self: { }) {}; "ngx-export-tools" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, ngx-export, safe + ({ mkDerivation, aeson, base, binary, bytestring, ngx-export , template-haskell }: mkDerivation { pname = "ngx-export-tools"; - version = "1.2.4"; - sha256 = "12qryvxkz8mjbpyrvmp7k3jh0zdf6f92a09jdhca8c2x7qdi3xn8"; + version = "1.2.4.1"; + sha256 = "120jk2d2yip9vd4r0s9b7z7ykh67i921svspn2kc7v5vwx95xn3w"; libraryHaskellDepends = [ - aeson base binary bytestring ngx-export safe template-haskell + aeson base binary bytestring ngx-export template-haskell ]; description = "Extra tools for Nginx Haskell module"; license = lib.licenses.bsd3; @@ -218879,8 +219671,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.7.0.0"; - sha256 = "03qh3691242n0yza6mk66d2l3gmhipfh1pk04qb4fzm9mhb472ps"; + version = "0.7.0.1"; + sha256 = "1b6wl253ffzs81w65is76cgijp47pg7mmyc83kjgc08irz98hi0p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222450,10 +223242,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.7"; - sha256 = "1nywxada76zqzraadwbmz3v6dpwbd997393ksrprci5n6myrakng"; - revision = "1"; - editedCabalFile = "1fxg13qd5rniidin08yjywgfk8dvwfc3y5n582z3x0x86b2ifxy6"; + version = "1.0.8"; + sha256 = "1bimn9jq8nw152jgb4la1cczz6c9ij8hf2xjg59z6inq4ssgyjl9"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -222499,8 +223289,8 @@ self: { }: mkDerivation { pname = "ogma-cli"; - version = "1.3.0"; - sha256 = "07a64p1b0yzx3wmxycifimjqvnfx9gpk6n3wl6rzgncl1fgf89h0"; + version = "1.4.0"; + sha256 = "096p2xx99d00p0qnrclnwdb4dq5wp1i2idz7wj1g7ccz3h26rm2z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ogma-core optparse-applicative ]; @@ -222522,8 +223312,8 @@ self: { }: mkDerivation { pname = "ogma-core"; - version = "1.3.0"; - sha256 = "0p3cwyrrjm56x3a8myfp1wlm7xy2j1d06y80arij8cl5cki95kwy"; + version = "1.4.0"; + sha256 = "03bbdqq69jqxfdaihykxxds4vcfvc6bydwkyz8zsanvsi5ifwza5"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring filepath IfElse mtl ogma-extra @@ -222545,8 +223335,8 @@ self: { }: mkDerivation { pname = "ogma-extra"; - version = "1.3.0"; - sha256 = "1pvnqcgi00v93jkzqxg770y2n0zbq53b0shi783apz9cjxm5a329"; + version = "1.4.0"; + sha256 = "1lg9xph8hsb9jfxvyka6hqb9n9ijw4da29girjf6y16cf7ras3j0"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ]; @@ -222563,8 +223353,8 @@ self: { }: mkDerivation { pname = "ogma-language-c"; - version = "1.3.0"; - sha256 = "0g1z3yh4x9p0iinc39ip1nm9s4d21nwc7gzss81vvc5f2m8hdqbg"; + version = "1.4.0"; + sha256 = "0bvsm9d65akrv67n9l9j0j0b6bpxddhj2fgzp4jrjw07dcqsfwpi"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222582,8 +223372,8 @@ self: { }: mkDerivation { pname = "ogma-language-cocospec"; - version = "1.3.0"; - sha256 = "18zv608mb3ifs14m3lmsc644cc2qhj9f0gjxgc85m2wq82blsxpb"; + version = "1.4.0"; + sha256 = "1n2i2zxcci5ys0z00h28ndqyl7ay0i200y5krxnarwy5b28xcjnf"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222599,8 +223389,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-language-copilot"; - version = "1.3.0"; - sha256 = "1d9grndx0774rz64x7g8hi9bz80ddayclzianyql0jzyw61ps70s"; + version = "1.4.0"; + sha256 = "16ybs7c1404c1hsmrimqs9lx0m5d24kvqjd99ljmk4vw4hb686if"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints"; license = "unknown"; @@ -222654,8 +223444,8 @@ self: { }: mkDerivation { pname = "ogma-language-jsonspec"; - version = "1.3.0"; - sha256 = "04w0fayj6hbqciw4fqn481gwlj34sq3r9i09zcqh2m455mybalyc"; + version = "1.4.0"; + sha256 = "0xrdnbsdm2a06r3n7i19bb9dcgssgb9fcly5c7rx7p4744lli3as"; libraryHaskellDepends = [ aeson base bytestring jsonpath megaparsec ogma-spec text ]; @@ -222671,8 +223461,8 @@ self: { }: mkDerivation { pname = "ogma-language-smv"; - version = "1.3.0"; - sha256 = "06hb9gxqg81gw5sqzsi966fk9yxhv9q7pclnwhjlaaya3jav3xx2"; + version = "1.4.0"; + sha256 = "1f2afvxdjgkgdc64w0f455fb4r9w43nbsjjm4q2s4lhqhrf7qqa9"; setupHaskellDepends = [ base BNFC Cabal process ]; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ @@ -222688,8 +223478,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ogma-spec"; - version = "1.3.0"; - sha256 = "01vph8dwqf0sw2bn3frik3s2jwnpap1nlkpl8jnk91q2xjc4zhfs"; + version = "1.4.0"; + sha256 = "01lgymsrvkh75jjssxbn5wzw3d51fpc27ngf6pfmrkbd7fx39287"; libraryHaskellDepends = [ base ]; description = "Ogma: Runtime Monitor translator: JSON Frontend"; license = "unknown"; @@ -222940,8 +223730,8 @@ self: { }: mkDerivation { pname = "om-fail"; - version = "0.1.0.2"; - sha256 = "0wv102jpyi69xij2rwzrz5pdlc7pxad0wqsf0zfj15sfl1cnwya6"; + version = "0.1.0.4"; + sha256 = "0nf4hdx8a2invk0wjq3ryk8l5psl8jjkixskadmk8zd8r06mf3ky"; libraryHaskellDepends = [ base monad-logger safe-exceptions transformers ]; @@ -222979,8 +223769,8 @@ self: { }: mkDerivation { pname = "om-http"; - version = "0.3.0.7"; - sha256 = "0lmca3l4pbhkrxfqwhvw4x6ds6bxml70agi73f5q509iwi3997ni"; + version = "0.3.1.0"; + sha256 = "1whs8v3m4ldxlw7as3jnw9snk3jx0biqkid2rr63c0kkxazlxjpp"; libraryHaskellDepends = [ async base bytestring directory filepath http-types mime-types monad-logger network om-show safe-exceptions servant @@ -223588,39 +224378,10 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.10.3.0"; - sha256 = "1zq2d8rb1zwrvg0civh2a6r01nv1v2ini9rykf63px00srs98p67"; - revision = "1"; - editedCabalFile = "1wd2jgvrlbnma5z3zxa709svcm06clhx8gh9gs1jxscdd6lr6sh7"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time-compat - time-locale-compat transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time time-compat - transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - }) {}; - - "opaleye_0_10_3_1" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-compat, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; version = "0.10.3.1"; sha256 = "1cv9p6kpb5i4x9bc8ak9vyfvhnqmycf8gbhaf4f6xb6rzwvllvd9"; + revision = "1"; + editedCabalFile = "192hpyb8a0vs7w4l0rq2j2ahqjip5m85w2ic63pn5sskmqcpaxb3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -223636,7 +224397,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "An SQL-generating DSL targeting PostgreSQL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -224069,8 +224829,8 @@ self: { pname = "openapi3"; version = "3.2.4"; sha256 = "182bl4z9npcci85771adg7iar1377b5clgzs6wya04j79d391jyv"; - revision = "1"; - editedCabalFile = "08ikd506fxz3pllg5w8lx9yn9qfqlx9il9xwzz7s17yxn5k3xmnk"; + revision = "2"; + editedCabalFile = "1y7is2q6jfq1k35swnw9yv2h122pd5f6zchxl8zah0laafkm03vq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -224144,8 +224904,8 @@ self: { }: mkDerivation { pname = "opencascade-hs"; - version = "0.2.2.0"; - sha256 = "0h50q77p60dpngm1bxwk8i5lvw05idcsl2jgsv6kq14jpsc65ajq"; + version = "0.2.2.1"; + sha256 = "0m64pi32003k2y8sh4i6ls23np5bjq23imwng8bh4qx77f4d3r8x"; libraryHaskellDepends = [ base resourcet ]; librarySystemDepends = [ TKBO TKBRep TKernel TKFillet TKG2d TKG3d TKGeomBase TKLCAF TKMath @@ -224752,16 +225512,17 @@ self: { "opentelemetry-plugin" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , hs-opentelemetry-api, hs-opentelemetry-propagator-w3c - , hs-opentelemetry-sdk, mwc-random, text, unordered-containers + , hs-opentelemetry-sdk, mwc-random, stm, stm-containers, text + , transformers, unordered-containers }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.0.0"; - sha256 = "10j37spgz06xa7n16bbqx9zwhh9yc7avbhmwlvhraikpcjfmz7j9"; + version = "1.1.0"; + sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api - hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random - text unordered-containers + hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm + stm-containers text transformers unordered-containers ]; description = "GHC plugin for open telemetry"; license = lib.licenses.bsd3; @@ -225264,6 +226025,8 @@ self: { pname = "oplang"; version = "0.5.0.0"; sha256 = "0psk8jyxdhx2spzrx6k3hka7pyb2mhhsdwwk1g4bzgd3hmxnhh5l"; + revision = "1"; + editedCabalFile = "043mxfr8yjhqzagaydyx0l9q326zpjfzji1l4k6vfdv745ibnd68"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -226042,17 +226805,6 @@ self: { }) {}; "ordered-containers" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "ordered-containers"; - version = "0.2.3"; - sha256 = "18w1dasny6xffbjlvmz9861l2xbkqlg2w5qxz9kw6frgfl2rg11n"; - libraryHaskellDepends = [ base containers ]; - description = "Set- and Map-like types that remember the order elements were inserted"; - license = lib.licenses.bsd3; - }) {}; - - "ordered-containers_0_2_4" = callPackage ({ mkDerivation, base, containers, hashable }: mkDerivation { pname = "ordered-containers"; @@ -226061,7 +226813,6 @@ self: { libraryHaskellDepends = [ base containers hashable ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ordering-duplicates" = callPackage @@ -226469,34 +227220,32 @@ self: { mainProgram = "ormolu"; }) {}; - "ormolu_0_7_4_0" = callPackage + "ormolu_0_7_7_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring - , Cabal-syntax, containers, deepseq, Diff, directory, file-embed - , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec - , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io - , QuickCheck, syb, temporary, text, th-env + , Cabal-syntax, choice, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, QuickCheck, syb, temporary, text, th-env }: mkDerivation { pname = "ormolu"; - version = "0.7.4.0"; - sha256 = "1s7a9crjhbsmjkdvpv8ycygpiikv96s96p3lmjik4pb3q7idir2z"; - revision = "1"; - editedCabalFile = "0cr96kxx13l6vjmgx3jan0xcr7zn68gnihfqsdz6fi7jbd34jhzl"; + version = "0.7.7.0"; + sha256 = "1069j7cldvqqazmfrpfc6wy816227c5vz7fbq860yfb5h9ycv5ns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal array base binary bytestring Cabal-syntax containers - deepseq Diff directory file-embed filepath ghc-lib-parser - megaparsec MemoTrie mtl syb text + ansi-terminal array base binary bytestring Cabal-syntax choice + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl syb text ]; executableHaskellDepends = [ base Cabal-syntax containers directory filepath ghc-lib-parser optparse-applicative text th-env ]; testHaskellDepends = [ - base Cabal-syntax containers directory filepath ghc-lib-parser - hspec hspec-megaparsec megaparsec path path-io QuickCheck temporary - text + base Cabal-syntax choice containers directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + QuickCheck temporary text ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -226639,8 +227388,8 @@ self: { }: mkDerivation { pname = "os-string"; - version = "2.0.2.2"; - sha256 = "0715lza6wr1gbsvv6a5xkcag38msqms4m6g8bkj5wz90axv0vk1z"; + version = "2.0.3"; + sha256 = "1sk1l3103f4w646lj47yyzxm8pzrk1xl6w9z3n8249h0z6wqiczn"; libraryHaskellDepends = [ base bytestring deepseq exceptions template-haskell ]; @@ -226803,6 +227552,19 @@ self: { mainProgram = "ostree-pin"; }) {}; + "osv" = callPackage + ({ mkDerivation, aeson, base, cvss, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "osv"; + version = "0.1.0.0"; + sha256 = "11w2x76ifx4sf6z5gz116pky4w4qv3l8nj2z57x61802l9ckrlqd"; + libraryHaskellDepends = [ aeson base cvss text time ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Open Source Vulnerability format"; + license = lib.licenses.bsd3; + }) {}; + "osx-ar" = callPackage ({ mkDerivation, base, binary, bytestring, containers }: mkDerivation { @@ -227219,8 +227981,8 @@ self: { pname = "package-version"; version = "0.3"; sha256 = "01d0345qs5c02gmh3ccsl0xbmiqwcbdpzlqgx2pwj6iv9vvjrf5l"; - revision = "3"; - editedCabalFile = "1cdrarcrf4rdzjvilr0nwwbavwmkv0kc3wq0qhca55710j4kxk5d"; + revision = "4"; + editedCabalFile = "08pjfpib8g8ci9d9p3461bg37k64f0360cx35v4i8lqj8ny69xvh"; libraryHaskellDepends = [ base bytestring deepseq prettyprinter safe-exceptions template-haskell text @@ -229176,6 +229938,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; + revision = "1"; + editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230577,8 +231341,8 @@ self: { }: mkDerivation { pname = "parser-unbiased-choice-monad-embedding"; - version = "0.0.0.4"; - sha256 = "1gp44c30xj37kym32j7vkl103ks0arb13xjrsar1zmlzzafa9fhz"; + version = "0.0.1.0"; + sha256 = "1q7bxrhqflg79b2r04vkgb02m2n4p071qi7ia4jb6qvpy5vg0z6w"; libraryHaskellDepends = [ base containers Earley srcloc ]; testHaskellDepends = [ base doctest lexer-applicative regex-applicative @@ -230866,6 +231630,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "partial-isomorphisms_0_2_4_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "partial-isomorphisms"; + version = "0.2.4.0"; + sha256 = "0f4lm8f3k76dxanarw1qvdl5b769jvqj9cr6bb7l3f151sabqkv4"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Partial isomorphisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "partial-lens" = callPackage ({ mkDerivation, base, comonad-transformers, data-lens , transformers @@ -231110,6 +231886,8 @@ self: { pname = "password"; version = "3.0.4.0"; sha256 = "0dn1qvf25kf5rwifp615wcqm8lh566knvw5mjhr4s8gwsymjdpsk"; + revision = "1"; + editedCabalFile = "0dsc1c97kvqrwyvgaxr88c8r07slbb899pf71m7mwlmiqlz9vhli"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory password-types @@ -231340,8 +232118,8 @@ self: { pname = "patch-image"; version = "0.3.3.2"; sha256 = "1kbd19vaizhbrpb4pa3py125kaw313yn3aq70yr7wygk1kk6v7ql"; - revision = "2"; - editedCabalFile = "098xpd9x8cm6w4b8azg4cl039whyh3mjimvhqmazhcn4hp4y4rr4"; + revision = "3"; + editedCabalFile = "1y3fv802jvnrc08qpmh4vvk2h83lbdkv12g6rckhcl4ppgrzc5lz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231491,28 +232269,6 @@ self: { }: mkDerivation { pname = "path-io"; - version = "1.8.1"; - sha256 = "1phaxzff8n4jfksdakbzxadh8m07h5ifscwyjz4h5568rlv7zlws"; - revision = "1"; - editedCabalFile = "092gf9fk6f2h5apv2lgqww49gbqjljz70nz6yp7c1l6rhkmcnxaz"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions filepath hspec path transformers - unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = lib.licenses.bsd3; - }) {}; - - "path-io_1_8_2" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; version = "1.8.2"; sha256 = "1a4s4fc2rbzri1cb27gzlm0v24k5g2975smvqg2j4d4h6xmpzbfd"; libraryHaskellDepends = [ @@ -231522,7 +232278,6 @@ self: { testHaskellDepends = [ base exceptions hspec path unix-compat ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "path-like" = callPackage @@ -231733,27 +232488,6 @@ self: { }: mkDerivation { pname = "patrol"; - version = "1.0.0.7"; - sha256 = "139zkmwclm2yigb6081b6zgiqirv9jwcxshx3kigf00vy4wb32z6"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions - http-client http-types network-uri text time uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers exceptions hspec - http-client http-types network-uri text time uuid - ]; - description = "Sentry SDK"; - license = lib.licenses.mit; - }) {}; - - "patrol_1_0_0_8" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, exceptions, hspec, http-client, http-types - , network-uri, text, time, uuid - }: - mkDerivation { - pname = "patrol"; version = "1.0.0.8"; sha256 = "0117g6am2g4057apz5xl2jya929bg7sbk4v7mqkllijph6sjycp2"; libraryHaskellDepends = [ @@ -231766,7 +232500,6 @@ self: { ]; description = "Sentry SDK"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "patronscraper" = callPackage @@ -232234,6 +232967,7 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "A regexp (regex) library on top of pcre-light you can actually use"; license = lib.licenses.publicDomain; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "pcre-less" = callPackage @@ -232431,27 +233165,6 @@ self: { }: mkDerivation { pname = "pdf-toolbox-content"; - version = "0.1.1"; - sha256 = "0bdcakhmazxim5npqkb13lh0b65p1xqv2a05c61zv0g64n1d6k5f"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring bytestring containers io-streams - pdf-toolbox-core scientific text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring containers hspec io-streams - pdf-toolbox-core - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - }) {}; - - "pdf-toolbox-content_0_1_2" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , containers, hspec, io-streams, pdf-toolbox-core, scientific, text - , vector - }: - mkDerivation { - pname = "pdf-toolbox-content"; version = "0.1.2"; sha256 = "1pxzn6ja0k29qb1sr000ksyscjilf8clk3li94i26z1kgxjqf05s"; libraryHaskellDepends = [ @@ -232464,7 +233177,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pdf-toolbox-core" = callPackage @@ -232475,33 +233187,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-core"; - version = "0.1.1"; - sha256 = "1d5bk7qbcgz99xa61xi17z0hgr3w2by3d5mr2vgd0hpcdi5ygskz"; - revision = "1"; - editedCabalFile = "1h5nh360zaql29lw3mcykip7bvnnjjcxmpaaz3s842a227m9wflz"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring bytestring cipher-aes cipher-rc4 - containers crypto-api cryptohash hashable io-streams scientific - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hspec io-streams unordered-containers - vector - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - }) {}; - - "pdf-toolbox-core_0_1_2" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , cipher-aes, cipher-rc4, containers, crypto-api, cryptohash - , hashable, hspec, io-streams, scientific, unordered-containers - , vector - }: - mkDerivation { - pname = "pdf-toolbox-core"; - version = "0.1.2"; - sha256 = "0i1078lj7q0xm52bnxnhhi8wdgnbwh029423g6hm9mj815lq825n"; + version = "0.1.3"; + sha256 = "1pvwilidzg9mb95g6bl0dlaygxq1yjxay6n5a907wxga54kj29w3"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring cipher-aes cipher-rc4 containers crypto-api cryptohash hashable io-streams scientific @@ -232513,7 +233200,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pdf-toolbox-document" = callPackage @@ -232523,29 +233209,8 @@ self: { }: mkDerivation { pname = "pdf-toolbox-document"; - version = "0.1.2"; - sha256 = "172vxsv541hsdkk08rsr21rwdrcxwmf4pwjmgsq2rjwj4ba4723y"; - libraryHaskellDepends = [ - base bytestring containers io-streams pdf-toolbox-content - pdf-toolbox-core text unordered-containers vector - ]; - testHaskellDepends = [ - base directory hspec io-streams pdf-toolbox-core - unordered-containers - ]; - description = "A collection of tools for processing PDF files"; - license = lib.licenses.bsd3; - }) {}; - - "pdf-toolbox-document_0_1_3" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hspec - , io-streams, pdf-toolbox-content, pdf-toolbox-core, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pdf-toolbox-document"; - version = "0.1.3"; - sha256 = "1yywab2xzp69k59636b63akb6nc4g9ql58qj11wkrdsvwvcv9lbb"; + version = "0.1.4"; + sha256 = "1lnh6mafrld72wbsgvar4q2i3qlp3c32ipqab2d1bhm18kg8lvzy"; libraryHaskellDepends = [ base bytestring containers io-streams pdf-toolbox-content pdf-toolbox-core text unordered-containers vector @@ -232556,7 +233221,6 @@ self: { ]; description = "A collection of tools for processing PDF files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pdf-toolbox-viewer" = callPackage @@ -233271,10 +233935,8 @@ self: { }: mkDerivation { pname = "perfect-vector-shuffle"; - version = "0.1.1.1"; - sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "5"; - editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw"; + version = "0.1.1.2"; + sha256 = "0xc75pf21jbc0q49vcr82p50gbfhqfhxq2z96mr3p42grhs0rwr5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -236644,8 +237306,8 @@ self: { }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.1.0"; - sha256 = "1a2ajm4g3ii4cz6wz6w1rcgpaaznxjv6qwjxy84jsq6s5krczkb0"; + version = "0.1.2.0"; + sha256 = "1wgjiqfv56iaqzv6brp0c8ni13zvn8sgx6iifm5zzlq3p20q62cm"; libraryHaskellDepends = [ base bytestring containers directory ghc time transformers ]; @@ -239952,10 +240614,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.1.3"; - sha256 = "0ms5d731by2rlwp3fxias8jfpdjih0k96rs8mqrycyyfsjxxilb8"; - revision = "1"; - editedCabalFile = "0a4m860wgk2wx55x93xia9dx29bj27f1dkvcz1q7b0jgjyvffc58"; + version = "1.9.2.0"; + sha256 = "1qwy6a59jdlzc2y7f422yvlwvd9spsgbbpm2r7jcasgxiwq3fkr0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -240047,8 +240707,8 @@ self: { }: mkDerivation { pname = "polysemy-blockfrost"; - version = "0.1.1.0"; - sha256 = "0vix900hxi9rns556l2nk0hmmbcshac8b028m9pxk9ybax2w3bqq"; + version = "0.1.2.0"; + sha256 = "0xwyay52brdipkp7xy3ypk9a6vgglln5biw5qzlp61czls7qf6qk"; libraryHaskellDepends = [ base blockfrost-api blockfrost-client polysemy polysemy-plugin text ]; @@ -240085,8 +240745,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.6.0.2"; - sha256 = "1d53m5i0v1g5c66wvy8ji7gmw0vzz9qh57hf0wx44kk45myva4ad"; + version = "0.7.0.0"; + sha256 = "1x91x960zzpwlscx7mkxfqq5jvd01gkzn66zdza1z0jjrbvkda34"; libraryHaskellDepends = [ base chronos incipit-core polysemy-time ]; @@ -240099,22 +240759,21 @@ self: { }) {}; "polysemy-conc" = callPackage - ({ mkDerivation, async, base, containers, hedgehog, incipit-core - , polysemy, polysemy-plugin, polysemy-resume, polysemy-test - , polysemy-time, stm, stm-chans, tasty, tasty-hedgehog, time - , torsor, unagi-chan, unix + ({ mkDerivation, async, base, hedgehog, incipit-core, polysemy + , polysemy-plugin, polysemy-resume, polysemy-test, polysemy-time + , stm, stm-chans, tasty, tasty-hedgehog, time, torsor, unagi-chan }: mkDerivation { pname = "polysemy-conc"; - version = "0.13.0.1"; - sha256 = "15blkrrh27wadi746qn590agsp0xqrxd6cnvzr9wkfkvv9hcizvj"; + version = "0.14.1.0"; + sha256 = "19m7hnx6f53dzkvj8gkbdds9qs1zfrbzy34iznigksmzyhhsjim4"; libraryHaskellDepends = [ - async base containers incipit-core polysemy polysemy-resume - polysemy-time stm stm-chans torsor unagi-chan unix + async base incipit-core polysemy polysemy-resume polysemy-time stm + stm-chans torsor unagi-chan ]; testHaskellDepends = [ async base hedgehog incipit-core polysemy polysemy-plugin - polysemy-test polysemy-time stm tasty tasty-hedgehog time unix + polysemy-test polysemy-time tasty tasty-hedgehog time torsor ]; description = "Polysemy effects for concurrency"; license = "BSD-2-Clause-Patent"; @@ -240317,8 +240976,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.10.0.1"; - sha256 = "0wm7qzwaqyhrmwpxvshi5168sbzyb8vya1fmi58jz3plmyz9drws"; + version = "0.11.0.0"; + sha256 = "03vbnvbpz3cn88mp2sgdxn2w63ciz26g6y948wszd21srrcix62i"; libraryHaskellDepends = [ ansi-terminal async base incipit-core polysemy polysemy-conc polysemy-time stm time @@ -240364,8 +241023,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.10.0.1"; - sha256 = "1srydqn5snp8lqdvwixkh956isl58172syvk2k020knwji5qgw9z"; + version = "0.11.0.0"; + sha256 = "00wsqawnclvqw9mi8yh9i607kjgg8vr8rz7fvrzjmdn13xrpy301"; libraryHaskellDepends = [ base di-polysemy incipit-core polysemy polysemy-conc polysemy-log polysemy-time stm @@ -240520,24 +241179,25 @@ self: { }) {}; "polysemy-process" = callPackage - ({ mkDerivation, base, incipit-core, path, path-io, polysemy - , polysemy-conc, polysemy-plugin, polysemy-resume, polysemy-test - , polysemy-time, posix-pty, process, stm-chans, tasty - , tasty-expected-failure, typed-process, unix + ({ mkDerivation, async, base, hedgehog, incipit-core, path, path-io + , polysemy, polysemy-conc, polysemy-plugin, polysemy-resume + , polysemy-test, polysemy-time, posix-pty, process, stm-chans + , tasty, tasty-expected-failure, tasty-hedgehog, typed-process + , unix }: mkDerivation { pname = "polysemy-process"; - version = "0.13.0.1"; - sha256 = "05n7k3jlssa448ixmxc9fmyb1szwfs9pcmvfg2ya40f2p5p8blkx"; + version = "0.14.1.0"; + sha256 = "15jg25chgy92q4k1xl3ndyn3mzc8gkh305zgihzci2lapn55q6cz"; libraryHaskellDepends = [ - base incipit-core path path-io polysemy polysemy-conc + async base incipit-core path path-io polysemy polysemy-conc polysemy-resume polysemy-time posix-pty process stm-chans typed-process unix ]; testHaskellDepends = [ - base incipit-core polysemy polysemy-conc polysemy-plugin - polysemy-resume polysemy-test polysemy-time tasty - tasty-expected-failure typed-process + async base hedgehog incipit-core polysemy polysemy-conc + polysemy-plugin polysemy-resume polysemy-test polysemy-time tasty + tasty-expected-failure tasty-hedgehog typed-process unix ]; description = "Polysemy effects for system processes"; license = "BSD-2-Clause-Patent"; @@ -240592,8 +241252,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.8.0.1"; - sha256 = "03qw5aivq39vjg88liz57pgw6frr68kx2lb8bfqxyjsf4anzg8nq"; + version = "0.9.0.0"; + sha256 = "1qzpj01pnzi8fapjjrvifkn7v8mw76xz3vfnd9yisxn2xpvgm85h"; libraryHaskellDepends = [ base incipit-core polysemy transformers ]; @@ -240660,8 +241320,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.9.0.0"; - sha256 = "09aysv1l95q3mx70n0bcnsanrvlynlnz2zl2zg6v2a8vdhnkw7s7"; + version = "0.10.0.0"; + sha256 = "037bjfl0my8hbhmv5nhlv8bmhxdyk16ql9n5bzw03aqkm7pc7p6k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base hedgehog incipit-core path path-io polysemy tasty @@ -240682,8 +241342,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.6.0.2"; - sha256 = "1zg0xyhp7zn9hl76zag097cpdzs38iap3zkc3bpy5amkkbw05kax"; + version = "0.7.0.0"; + sha256 = "0yjv0dz6l1a81jl7x6z4sff22qx68cf2vy0fld8v66wppfrpq199"; libraryHaskellDepends = [ aeson base incipit-core template-haskell time torsor ]; @@ -241043,14 +241703,64 @@ self: { license = lib.licenses.bsd3; }) {}; + "pontarius-xmpp_0_5_7_0" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary + , bytestring, Cabal, conduit, containers, criterion, crypto-api + , cryptohash, cryptohash-cryptoapi, crypton-x509-system + , data-default, dns, exceptions, generic-arbitrary, hslogger, hspec + , hspec-expectations, iproute, lens, lens-family, lifted-base, mtl + , network, profunctors, pureMD5, QuickCheck, quickcheck-instances + , random, ranges, resourcet, smallcheck, split, stm, stringprep + , tasty, tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, tls, transformers, unbounded-delays, void + , xml-conduit, xml-picklers, xml-types + }: + mkDerivation { + pname = "pontarius-xmpp"; + version = "0.5.7.0"; + sha256 = "0v1dvps1rz1mkxanx9wnhjqkyzk9qg9b40zcgy2ckz3wyc8362mj"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring conduit + containers crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions hslogger iproute + lens lens-family lifted-base mtl network profunctors pureMD5 random + resourcet split stm stringprep template-haskell text tls + transformers unbounded-delays void xml-conduit xml-picklers + xml-types + ]; + testHaskellDepends = [ + async attoparsec base base64-bytestring binary bytestring Cabal + conduit containers crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions generic-arbitrary + hslogger hspec hspec-expectations iproute lens lens-family + lifted-base mtl network profunctors pureMD5 QuickCheck + quickcheck-instances random ranges resourcet smallcheck split stm + stringprep tasty tasty-hspec tasty-hunit tasty-quickcheck tasty-th + template-haskell text tls transformers unbounded-delays void + xml-conduit xml-picklers xml-types + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring conduit + containers criterion crypto-api cryptohash cryptohash-cryptoapi + crypton-x509-system data-default dns exceptions hslogger iproute + lens lens-family lifted-base mtl network profunctors pureMD5 random + resourcet split stm stringprep template-haskell text tls + transformers unbounded-delays void xml-conduit xml-picklers + xml-types + ]; + description = "An XMPP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pontarius-xmpp-extras" = callPackage ({ mkDerivation, base, data-default, pontarius-xmpp, text, time , xml-types }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.9"; - sha256 = "1pbwbhymdfqcpmpgcx1473fqaygr9mchlpqhr4i7hqbvhndwvqnl"; + version = "0.1.0.10"; + sha256 = "132b3vr9y9q3xclclaa9n57y66qrh77ajpfz3vnx0r4p2yl2xy38"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -243276,8 +243986,8 @@ self: { }: mkDerivation { pname = "powerdns"; - version = "0.4.2"; - sha256 = "1pf57anqc7f90p6rhnlz78asm0xpj1wgh0642zb7g98pyxr1qx7g"; + version = "0.4.4"; + sha256 = "0vg2s1afrjj25wrw7ss0ni12ildqdwp9zr83a2gg4mkb02p3sk2z"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq hashable servant servant-client servant-client-core text @@ -246541,8 +247251,8 @@ self: { }: mkDerivation { pname = "project-m36"; - version = "0.9.9"; - sha256 = "07d3jr66gk48l4cmy2acigi61zwxn1pa6gg09lxazi5c8ii6zhzf"; + version = "1.0.0"; + sha256 = "05b1akwvxh30nh8z7c4b89w0nbzwqfxizr24i4q93dzh5h12w83b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246566,10 +247276,10 @@ self: { hashable haskeline http-api-data http-conduit http-types HUnit list-t megaparsec modern-uri MonadRandom mtl network optparse-applicative parallel parser-combinators path-pieces - prettyprinter random scientific scotty semigroups stm - stm-containers template-haskell temporary text time transformers - unordered-containers uuid vector wai wai-websockets warp warp-tls - websockets winery + prettyprinter random recursion-schemes scientific scotty semigroups + stm stm-containers template-haskell temporary text time + transformers unordered-containers uuid vector wai wai-websockets + warp warp-tls websockets winery ]; testHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -246577,9 +247287,10 @@ self: { data-interval deepseq deepseq-generics directory filepath gnuplot hashable haskeline http-conduit http-types HUnit list-t megaparsec modern-uri MonadRandom mtl network optparse-applicative parallel - parser-combinators prettyprinter random scientific semigroups stm - stm-containers temporary text time transformers - unordered-containers uuid vector wai warp websockets winery + parser-combinators prettyprinter random recursion-schemes + scientific semigroups stm stm-containers temporary text time + transformers unordered-containers uuid vector wai warp websockets + winery ]; benchmarkHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -247042,13 +247753,14 @@ self: { }) {}; "propeller" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "propeller"; - version = "0.1.0.0"; - sha256 = "00v1j1mv5dl6vivkfqv9w9jvw1jh3085mpkax5x0cyndhqcw027x"; - libraryHaskellDepends = [ base ]; - description = "A Simple Propagator Library"; + version = "0.2.0.0"; + sha256 = "19mx2y5ba8jzgjn8g0basdpwpy4sv8y90m6cjy4z353wfyspjxxs"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers ]; + description = "A Propagator Library"; license = lib.licenses.bsd3; }) {}; @@ -247544,8 +248256,8 @@ self: { }: mkDerivation { pname = "proto3-wire"; - version = "1.4.2"; - sha256 = "0ly8nc5z6ri1bj5l8h0r23kwsjr0m7nrwbyzxscp5q4880rqx492"; + version = "1.4.3"; + sha256 = "0gsb0qzxpgpy64jmx2fsbb7cjzixpfsqb2zjws62kg89sgkid8vz"; libraryHaskellDepends = [ base bytestring cereal containers deepseq hashable parameterized primitive QuickCheck safe template-haskell text text-short @@ -249236,8 +249948,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.4.0.0"; - sha256 = "0b5si5c6mhs4a9845qjl0svlgwb7vc0mzr9br20027f44l49dpzl"; + version = "0.4.0.1"; + sha256 = "00kdmw6had2nhhfrlja9zklvn965khbxbiwcx05zzirfdph8szkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249253,6 +249965,7 @@ self: { description = "Send push notifications to mobile iOS devices"; license = lib.licenses.bsd3; mainProgram = "sendapn"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "push-notify-ccs" = callPackage @@ -250713,8 +251426,8 @@ self: { pname = "queues"; version = "1.0.0"; sha256 = "0mnn6lgd7101lrmwqy4lf04ncq8ci2kfxydm1rlh879gjvzz3lsr"; - revision = "1"; - editedCabalFile = "1bjjbpx4zm3rkkrpd7sh7ji65g84a6vi34skxkg18zhqcyj3d7wv"; + revision = "2"; + editedCabalFile = "08nksja87alndilff5pgvz6kb8m1kj1fkk00xz67p2cml981r2q7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hedgehog ]; benchmarkHaskellDepends = [ base containers tasty-bench ]; @@ -250731,6 +251444,8 @@ self: { pname = "quibble-core"; version = "0.1.0.1"; sha256 = "108cqh3xzl73ijh7fg91cyw0lpn2svm13l8nn922ab9401jy9x8c"; + revision = "1"; + editedCabalFile = "0kfb3714jq791riywhh0nbixzjj7nkpl2y0w8c1cy5hhx2q1jigy"; libraryHaskellDepends = [ base bytestring containers mono-traversable optics-core text text-conversions time uuid @@ -250754,10 +251469,8 @@ self: { }: mkDerivation { pname = "quic"; - version = "0.1.20"; - sha256 = "0zzpdb07xrgx3bcvnfmn778yamk6q86lqmj1ir1h3g82gcknzfxm"; - revision = "1"; - editedCabalFile = "0nnl78qiczrsqzjhfvwc89m6v1kyvaysph5v1m9bi37ainvy8222"; + version = "0.1.22"; + sha256 = "1lnfqsfigzrh0saixava2645nixjwdf26mxl914hm63jqk8hxfma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -250987,28 +251700,6 @@ self: { "quickcheck-groups" = callPackage ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show - , QuickCheck, quickcheck-classes, quickcheck-instances - , semigroupoids - }: - mkDerivation { - pname = "quickcheck-groups"; - version = "0.0.1.2"; - sha256 = "0pv1j93g4cmfsh4yijrcc7qgrkggk92jmhl1qjj83yzszm4fb80p"; - libraryHaskellDepends = [ - base groups pretty-show QuickCheck quickcheck-classes - quickcheck-instances semigroupoids - ]; - testHaskellDepends = [ - base groups hspec QuickCheck quickcheck-classes - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Testing group class instances with QuickCheck"; - license = lib.licenses.asl20; - }) {}; - - "quickcheck-groups_0_0_1_3" = callPackage - ({ mkDerivation, base, groups, hspec, hspec-discover, pretty-show , QuickCheck, quickcheck-classes, semigroupoids }: mkDerivation { @@ -251025,7 +251716,6 @@ self: { doHaddock = false; description = "Testing group class instances with QuickCheck"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-higherorder" = callPackage @@ -251081,6 +251771,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.31"; sha256 = "0bsfh6fwc8h3jzkqrqk56rm6iphrmlrp80pa2z1gs79mz4d7w64v"; + revision = "1"; + editedCabalFile = "1l92l30ghks35wr4im54h44ipw8ddwh3jsinl5snmy2jgv3jaz89"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time OneTuple primitive QuickCheck @@ -251116,6 +251808,8 @@ self: { pname = "quickcheck-lockstep"; version = "0.5.0"; sha256 = "0ap8qgv33a6rwvvplmmf2hh68hk257l0maznkvlmi7cds6z90bk4"; + revision = "1"; + editedCabalFile = "19iqirk5k92l8k04clppvv84i0z9kfvbffk0jwvljs4jn35qx5mq"; libraryHaskellDepends = [ base constraints containers mtl QuickCheck quickcheck-dynamic ]; @@ -251136,31 +251830,6 @@ self: { }: mkDerivation { pname = "quickcheck-monoid-subclasses"; - version = "0.3.0.3"; - sha256 = "0z7i93f9r6f0c8xvyja8v4gwm4ydhymir9lzncails53v2aw1g71"; - libraryHaskellDepends = [ - base containers monoid-subclasses pretty-show QuickCheck - quickcheck-classes quickcheck-instances semigroupoids - ]; - testHaskellDepends = [ - base bytestring commutative-semigroups containers hspec - monoid-subclasses QuickCheck quickcheck-classes - quickcheck-instances text vector - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Testing monoid subclass instances with QuickCheck"; - license = lib.licenses.asl20; - }) {}; - - "quickcheck-monoid-subclasses_0_3_0_4" = callPackage - ({ mkDerivation, base, bytestring, commutative-semigroups - , containers, hspec, hspec-discover, monoid-subclasses, pretty-show - , QuickCheck, quickcheck-classes, quickcheck-instances - , semigroupoids, text, vector - }: - mkDerivation { - pname = "quickcheck-monoid-subclasses"; version = "0.3.0.4"; sha256 = "1ndyk2l8m5g7vx5q5kmkawv3v8s5yydfg7snr203188zamskcq85"; libraryHaskellDepends = [ @@ -251176,7 +251845,6 @@ self: { doHaddock = false; description = "Testing monoid subclass instances with QuickCheck"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-poly" = callPackage @@ -251395,27 +252063,27 @@ self: { broken = true; }) {}; - "quickcheck-state-machine_0_9_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, array, base, base-compat - , bifunctors, bytestring, containers, directory, doctest - , exceptions, filelock, filepath, generics-sop, graphviz, hashable - , hashtables, http-client, MemoTrie, monad-logger, mtl, network - , persistent, persistent-postgresql, persistent-sqlite - , postgresql-simple, pretty, pretty-show, process, QuickCheck - , quickcheck-instances, random, resource-pool, resourcet - , servant-client, servant-server, sop-core, split, stm, strict - , string-conversions, tasty, tasty-hunit, tasty-quickcheck, text - , time, unliftio, unliftio-core, vector, warp + "quickcheck-state-machine_0_10_0" = callPackage + ({ mkDerivation, array, base, base-compat, bifunctors, bytestring + , containers, directory, doctest, exceptions, filelock, filepath + , generics-sop, graphviz, hashable, hashtables, http-client + , MemoTrie, monad-logger, mtl, network, persistent + , persistent-postgresql, persistent-sqlite, postgresql-simple + , pretty, pretty-show, prettyprinter, prettyprinter-ansi-terminal + , process, QuickCheck, quickcheck-instances, random, resource-pool + , resourcet, servant-client, servant-server, sop-core, split, stm + , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck + , text, time, unliftio, unliftio-core, vector, warp }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.9.0"; - sha256 = "1b0zsnrr57wymc203rnmidyy5czvcfip5x9jn8vk3m581yl2ljfs"; + version = "0.10.0"; + sha256 = "09xm7lc24ps4il2x5gbl01643zp5j26ps6r2jxw05n8859flp4lq"; libraryHaskellDepends = [ - ansi-wl-pprint base base-compat bytestring containers directory - exceptions filepath generics-sop graphviz MemoTrie mtl pretty - pretty-show QuickCheck random sop-core split text time unliftio - vector + base base-compat bytestring containers directory exceptions + filepath generics-sop graphviz MemoTrie mtl pretty pretty-show + prettyprinter prettyprinter-ansi-terminal QuickCheck random + sop-core split text time unliftio vector ]; testHaskellDepends = [ array base bifunctors bytestring containers directory doctest @@ -252250,8 +252918,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.9"; - sha256 = "11xacqd1xcbpb34h04ch7zz1bsal90zk4h6fvgqb7a8fj094ci2v"; + version = "0.3.10"; + sha256 = "08gpnkb1nj11rhqybgcfcnglf9h271r1hpgsqv9ljzzyc0d67bkp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -252676,14 +253344,31 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "ral_0_2_2" = callPackage + ({ mkDerivation, adjunctions, base, bin, boring, criterion, deepseq + , distributive, fin, hashable, indexed-traversable, QuickCheck + , semigroupoids, vector + }: + mkDerivation { + pname = "ral"; + version = "0.2.2"; + sha256 = "1c301l9mcq86wkgb4x8vhjrzb0nmv75dsixg5bgmwqp8rbh0xis6"; + libraryHaskellDepends = [ + adjunctions base bin boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Random access lists"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "ral-lens" = callPackage ({ mkDerivation, base, bin, fin, lens, ral }: mkDerivation { pname = "ral-lens"; - version = "0.2"; - sha256 = "0nlw0q0b8bza98h74k0wa2vc9m5bk6g9slri1mzd6cr1pmpvna67"; - revision = "4"; - editedCabalFile = "03wb2rwsh3qwb91iv8ydpbpk74ixfw3krw67dwh4l29057c4p31g"; + version = "0.2.1"; + sha256 = "04i3mq49y3swvzyzhjzjgalwwbgn29vjwkqda7b8hs33wxaza7d6"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = lib.licenses.gpl2Plus; @@ -252693,10 +253378,8 @@ self: { ({ mkDerivation, base, bin, fin, optics-core, ral }: mkDerivation { pname = "ral-optics"; - version = "0.2"; - sha256 = "1s7pxkf0vw1a5k1gwyfn6wsmiaa4csbghqshdbva8c73510q0fp1"; - revision = "4"; - editedCabalFile = "17vp96nsgf74b275547mgbwyc858lffy53fggs8nf1b8637mnjvs"; + version = "0.2.1"; + sha256 = "117nwsw8h167fi1x416xifa4pq9ihvasj9144cdg4mmk2ly9br2n"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = lib.licenses.gpl2Plus; @@ -252757,25 +253440,12 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "rampart"; - version = "2.0.0.7"; - sha256 = "03yvjnyij98c1lmak3511zn1rfczwnjaal0vrqq3lq5j89ysvyrf"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Determine how intervals relate to each other"; - license = lib.licenses.mit; - }) {}; - - "rampart_2_0_0_8" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "rampart"; version = "2.0.0.8"; sha256 = "1sdagiz1075kvad525f3q72krn7hvhkrbq1j4dwca4i4p77jdi17"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Determine how intervals relate to each other"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ramus" = callPackage @@ -253382,28 +254052,6 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.5.3"; - sha256 = "1smcplhgh1xmgdp4i5d7sbmvm80s05z5p1vhyywsq4x2hpz20a7g"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base data-functor-logistic distributive template-haskell - transformers - ]; - testHaskellDepends = [ - base data-functor-logistic distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = lib.licenses.bsd3; - }) {}; - - "rank2classes_1_5_3_1" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, data-functor-logistic - , distributive, doctest, markdown-unlit, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "rank2classes"; version = "1.5.3.1"; sha256 = "1gbcc6damm3wix4g7lk046cf0qsmy8i06mz54id5gw6qccbicnsh"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -253417,7 +254065,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rapid" = callPackage @@ -253726,27 +254373,6 @@ self: { }: mkDerivation { pname = "ratel"; - version = "2.0.0.11"; - sha256 = "1v396lxy4xm5ydsxd7c0hpzglysarzp4s872pdiygbfyz0hayhbg"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = lib.licenses.mit; - }) {}; - - "ratel_2_0_0_12" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, uuid - }: - mkDerivation { - pname = "ratel"; version = "2.0.0.12"; sha256 = "015riig033fm3pmgm90j2rlynyk5vnd3d9z6izh63ab76kppyh6s"; libraryHaskellDepends = [ @@ -253756,7 +254382,6 @@ self: { testHaskellDepends = [ base filepath hspec ]; description = "Notify Honeybadger about exceptions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -253765,21 +254390,6 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "2.0.0.6"; - sha256 = "01i4k821s10216flhcbcvv7jb1rzn6cqacj10j578l4761h0acz6"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = lib.licenses.mit; - }) {}; - - "ratel-wai_2_0_0_7" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; version = "2.0.0.7"; sha256 = "02a6jv5hri6y26idgfxpnyhfjsgiwc1ssks3pn7vcqlahampqa5i"; libraryHaskellDepends = [ @@ -253787,7 +254397,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ratelimiter" = callPackage @@ -253976,6 +254585,7 @@ self: { ]; description = "Haskell client for Sentry logging service"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "raven-haskell-scotty" = callPackage @@ -255140,8 +255750,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.2"; - sha256 = "0vkdkyrlmja0aa8h4q04p3rlzvcd0lb4pr07f191dbnd7siwk9dw"; + version = "0.1.0.3"; + sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -255314,6 +255924,28 @@ self: { license = lib.licenses.mit; }) {}; + "rebase_1_21" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, comonad, containers + , contravariant, deepseq, dlist, either, groups, hashable + , invariant, mtl, profunctors, scientific, selective, semigroupoids + , stm, text, time, time-compat, transformers, unordered-containers + , uuid-types, vector, vector-instances, void + }: + mkDerivation { + pname = "rebase"; + version = "1.21"; + sha256 = "079cj1bz2wclzz7169hcxb7psyz75a69rdpq532ib38lr22m7fih"; + libraryHaskellDepends = [ + base bifunctors bytestring comonad containers contravariant deepseq + dlist either groups hashable invariant mtl profunctors scientific + selective semigroupoids stm text time time-compat transformers + unordered-containers uuid-types vector vector-instances void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -255630,8 +256262,8 @@ self: { }: mkDerivation { pname = "recover-rtti"; - version = "0.4.3"; - sha256 = "044qrvq4js03w916d9imyjbq4x0dwwm68d56l0fjsjzzvzin76v7"; + version = "0.5.0"; + sha256 = "17jx201m9x14d624agxx96wkscmlppilmdsjwnh9p930504f66mp"; libraryHaskellDepends = [ aeson base bytestring containers ghc-heap ghc-prim mtl primitive sop-core stm text unordered-containers vector @@ -255662,10 +256294,8 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.2.2.5"; - sha256 = "1v4p9ms35sszi5f9f2pnfxhfpypwqj9pmhycc7ghlnnxsvarpdsw"; - revision = "1"; - editedCabalFile = "0rz78i40nsk3jywkdssqhla8vpbyhrdd95js5ncxwc0p6s5xp4h9"; + version = "5.2.3"; + sha256 = "020fk7s4dzim3957h8447mi3jp95k25zrac86dcaavldxjy88kiv"; libraryHaskellDepends = [ base comonad containers data-fix free template-haskell th-abstraction transformers @@ -256286,6 +256916,20 @@ self: { license = lib.licenses.mit; }) {}; + "reference-counting" = callPackage + ({ mkDerivation, atomic-counter, base, containers, linear-base }: + mkDerivation { + pname = "reference-counting"; + version = "0.1.0.0"; + sha256 = "1q0nnm4x1nw6hzymzaxg6rvsd9nwqnmxwrwmwphfa37lz4mcn2lr"; + libraryHaskellDepends = [ + atomic-counter base containers linear-base + ]; + testHaskellDepends = [ base linear-base ]; + description = "A reference counting library to alias linear resources"; + license = lib.licenses.bsd3; + }) {}; + "references" = callPackage ({ mkDerivation, array, base, containers, directory, either , filepath, HUnit, instance-control, lens, mtl, template-haskell @@ -257256,8 +257900,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.5.2.0"; - sha256 = "0aszgik0iir6f0n9zzak7w8s7cpc6sh77f5nbkgdyqswscnsfacq"; + version = "0.5.2.1"; + sha256 = "1hfvs6igpavzr6cd4mc7asxj2iwhcjzi7mc4fbfwnq1jmll9xp37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -259900,6 +260544,8 @@ self: { pname = "req"; version = "3.13.2"; sha256 = "1pmhfn4rq4n5r2jmml8bj287iaipfl576s0csl4yaf31j0ll1gjv"; + revision = "4"; + editedCabalFile = "1zgxl5w68pplz3s9m9q7jjrcyijyzqlb7xgx1j7pqs57lyr9hsxd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -259920,6 +260566,40 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "req_3_13_3" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, containers, crypton-connection + , data-default-class, exceptions, hspec, hspec-core, hspec-discover + , http-api-data, http-client, http-client-tls, http-types + , modern-uri, monad-control, mtl, QuickCheck, retry + , template-haskell, text, time, transformers, transformers-base + , unliftio-core + }: + mkDerivation { + pname = "req"; + version = "3.13.3"; + sha256 = "162hqajwdnkpl0hylkzf33jxh68nyq1bnsyp3wi6h394phrgniy3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive containers crypton-connection data-default-class + exceptions http-api-data http-client http-client-tls http-types + modern-uri monad-control mtl retry template-haskell text + transformers transformers-base unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-api-data http-client http-types modern-uri + QuickCheck retry template-haskell text time + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "HTTP client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , hspec-discover, http-client, req, temporary, weigh @@ -260123,14 +260803,26 @@ self: { license = lib.licenses.mit; }) {}; + "rerebase_1_21" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.21"; + sha256 = "0rpsc746vd5yqc6rii6dx38pbcx3w3xv7ghcqlz1nb7yzkj4yi6d"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show }: mkDerivation { pname = "rerefined"; - version = "0.4.0"; - sha256 = "1x7k3s45k9g7g62y5spg52m64fjqxa4bh6dy6d71p6fa2qyhxf2b"; + version = "0.5.1"; + sha256 = "0n775yxclxpnw0nf6g0ai6pdmckvw5v8rw03fss51mq1y9xw8dcg"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show @@ -261633,8 +262325,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "1.3"; - sha256 = "0n6pa29sxkr1vchyayr8sq8akc5jpr8kbn9l2dr9k24y9x55m8jr"; + version = "1.4.0.1"; + sha256 = "1878fwyvghm0k9ayba88abyf7ca9abgzc03290ldkzwbn2kg5gwg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ automaton base containers deepseq free mmorph monad-schedule @@ -261658,20 +262350,20 @@ self: { }) {}; "rhine-bayes" = callPackage - ({ mkDerivation, base, dunai, log-domain, mmorph, monad-bayes + ({ mkDerivation, automaton, base, log-domain, mmorph, monad-bayes , rhine, rhine-gloss, time, transformers }: mkDerivation { pname = "rhine-bayes"; - version = "1.2"; - sha256 = "0zffcvhx2bh1wcbizbjvy1gpcn4l8yjzppi54dcl9zxkpdbap5hb"; + version = "1.4.0.1"; + sha256 = "1qkk7sn4zgvm817iii1g930w593wwpcm2anrpml29zj9wznllbj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dunai log-domain monad-bayes rhine transformers + automaton base log-domain mmorph monad-bayes rhine transformers ]; executableHaskellDepends = [ - base dunai log-domain mmorph monad-bayes rhine rhine-gloss time + automaton base log-domain mmorph monad-bayes rhine rhine-gloss time transformers ]; description = "monad-bayes backend for Rhine"; @@ -261686,8 +262378,8 @@ self: { }: mkDerivation { pname = "rhine-gloss"; - version = "1.3"; - sha256 = "1x21mjaiy4adfph7wk85xh3fv037zvfgzmh8ng2bima4i1brn11h"; + version = "1.4.0.1"; + sha256 = "02yrmkl1zl3kys0jzkgz23ah8jwqilbkpijsh4fk8cv16ar9nmgw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261707,8 +262399,8 @@ self: { }: mkDerivation { pname = "rhine-terminal"; - version = "1.3"; - sha256 = "0jafqyg7ipfhnxwk4k9q6r3w72amrx9ir0w4r3mfzjq1bxgclzxr"; + version = "1.4.0.1"; + sha256 = "1rzs3mcq489kky55m0cljflqcaw53mzrg0ysnf4snpi41vmp3gh6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262047,17 +262739,17 @@ self: { "richenv" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover - , QuickCheck, quickcheck-instances, text, unordered-containers - , yaml + , HsYAML, HsYAML-aeson, QuickCheck, quickcheck-instances, text + , unordered-containers }: mkDerivation { pname = "richenv"; - version = "0.1.0.1"; - sha256 = "0jpj1xgwgw8lvah2jkmhvwiyx47n57bvayn5msyhqvrjsbdk90yk"; + version = "0.1.0.2"; + sha256 = "0yxl6cnhg7n29f93mj4a5wkp1v1i2y38824n2bg8b64ik1hlg876"; libraryHaskellDepends = [ aeson base text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring hspec QuickCheck quickcheck-instances text - unordered-containers yaml + aeson base bytestring hspec HsYAML HsYAML-aeson QuickCheck + quickcheck-instances text unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Rich environment variable setup for Haskell"; @@ -262939,26 +263631,6 @@ self: { }: mkDerivation { pname = "roc-id"; - version = "0.2.0.2"; - sha256 = "1sx66ixilvfzwnic16balzfdynpc891b3lj8gsyp9xd6z059pa61"; - libraryHaskellDepends = [ - base MonadRandom Only text vector-sized - ]; - testHaskellDepends = [ - base hspec MonadRandom Only QuickCheck text vector-sized - ]; - description = "Implementation of the ROC (Taiwan) National ID standard"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "roc-id_0_2_0_3" = callPackage - ({ mkDerivation, base, hspec, MonadRandom, Only, QuickCheck, text - , vector-sized - }: - mkDerivation { - pname = "roc-id"; version = "0.2.0.3"; sha256 = "1alniidc069v24gamc4ch058pfqs97hz5mmsgjhidz8j1294pii5"; libraryHaskellDepends = [ @@ -263770,6 +264442,8 @@ self: { pname = "rounded-hw"; version = "0.4.0"; sha256 = "1844qb2nsv25ix41jkrcr0n08wa4zsnrn7wpxxavnabi4j7mf8yz"; + revision = "1"; + editedCabalFile = "1h2cxi47xmpmq5bdfd6jq3pag6sg7rqw3qw6577smjzrpydb67l5"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base deepseq fp-ieee primitive tagged vector @@ -265642,8 +266316,10 @@ self: { ({ mkDerivation, base, template-haskell, th-abstraction }: mkDerivation { pname = "safe-wild-cards"; - version = "1.0.0.1"; - sha256 = "0kvr91ygb6wjr27scmvjazcbvv2y2kvs0mp8pjqv570wwsi593cy"; + version = "1.0.0.2"; + sha256 = "1b249139ymylvyxzkn0nk7hqgcmxz89mbgs5zc6f7l17gd7iqvap"; + revision = "1"; + editedCabalFile = "0v52sndb7d27w7ad20rfi26qn1fmc0rm5jygxh4zyiwrckrj0nkc"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base ]; description = "Use RecordWildCards safely"; @@ -266051,25 +266727,12 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; - version = "2.0.0.4"; - sha256 = "1csk70mgawp7298x787xk4sshh7xm71vrc703vjwy3mv3i0sg94x"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HUnit ]; - description = "Semantic version numbers and constraints"; - license = lib.licenses.mit; - }) {}; - - "salve_2_0_0_5" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "salve"; version = "2.0.0.5"; sha256 = "1n86a61rn5mmxi4whfwxv3ydn47h4537swqgwbg5adys9hwk7pqp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "salvia" = callPackage @@ -266627,6 +267290,8 @@ self: { pname = "sasha"; version = "0.2"; sha256 = "1z99hdbn94ngfinijgsd5x4lllwpyxc8jkf67lk0f6p12jfq7qv0"; + revision = "1"; + editedCabalFile = "0k3c54jajid7ggrm87xa0fvh11zjmhy2qn6lply1nykjhip9q1qn"; libraryHaskellDepends = [ base bytestring containers lattices QuickCheck template-haskell th-letrec wide-word word8set @@ -266988,7 +267653,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_0_0" = callPackage + "sbp_6_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -266997,8 +267662,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.0.0"; - sha256 = "0g6s3ga93y2khs8mvjrqk3v7wzgfjg9y2g6clz0ng57129n579lp"; + version = "6.0.1"; + sha256 = "12q23hdj8xddq9kq73nqf50qwdazqlv6xrb0dyxs5xg3kvlpccwq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267155,8 +267820,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "9.8.2"; - sha256 = "1i1v8jhb2ms41ij1hj5bx9bhn8ig9rl45jn493i61ykv7md3i2m5"; + version = "9.10.1"; + sha256 = "0rdz2a6y23m2h9dcxg4bxl3sqd0q81gd6krflcjhgbhjrbqkjwcx"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -267547,8 +268212,8 @@ self: { }: mkDerivation { pname = "scc"; - version = "0.8.3.1"; - sha256 = "1l89lq20khi3fysbvfxjzchbdw9civz1kj85fyjf8wcm3s3cq34l"; + version = "0.8.4"; + sha256 = "017swv1mvwq05c8fvbqsnbr9xikga4sp9ngmzckggvpbqx5vxd3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268286,8 +268951,8 @@ self: { pname = "scotty"; version = "0.22"; sha256 = "075qnj3s1ddq337qcbrgwsc12rgjm1g5p755iaf67k824p0rifff"; - revision = "1"; - editedCabalFile = "1xx6rq7w2zzim2s8q1gj1z7amgd0jsn3l3rv0pdnh0z5cxw5ydhj"; + revision = "2"; + editedCabalFile = "1m3qvb5q6yigw6ijxnp6h66rmyqg54619hb240s7cqc9qjrrkixk"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive cookie data-default-class exceptions http-types monad-control mtl network @@ -270141,8 +270806,8 @@ self: { pname = "semaphore-compat"; version = "1.0.0"; sha256 = "1qnrdqayrdazmsflh37p1igd25nh1cfgn4k1v3jwwb0w0amnyvhw"; - revision = "2"; - editedCabalFile = "17abqbz6swzwilbfiv6rr6p8j81w4x9hr5vmx5pa6284liv61xx8"; + revision = "3"; + editedCabalFile = "0m8qiy2kkw2w7c0jxii0l513457s1y9zvl6p1c4yzf3jxy623r9d"; libraryHaskellDepends = [ base exceptions unix ]; description = "Cross-platform abstraction for system semaphores"; license = lib.licenses.bsd3; @@ -270205,26 +270870,6 @@ self: { }: mkDerivation { pname = "semialign"; - version = "1.3"; - sha256 = "0v657hpbngbwygpmqz47dw7nwn5cbilf0khjdka8sjjqkwql73k2"; - revision = "1"; - editedCabalFile = "08sjh4vpkjc4mibrb34kn6rim7cbnsm57h383ycm5c6nl5ffzsbv"; - libraryHaskellDepends = [ - base containers hashable indexed-traversable - indexed-traversable-instances semigroupoids tagged these - transformers unordered-containers vector - ]; - description = "Align and Zip type-classes from the common Semialign ancestor"; - license = lib.licenses.bsd3; - }) {}; - - "semialign_1_3_1" = callPackage - ({ mkDerivation, base, containers, hashable, indexed-traversable - , indexed-traversable-instances, semigroupoids, tagged, these - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "semialign"; version = "1.3.1"; sha256 = "1xwx1icyggjbjflgn75bsqw34dmpsd15qqmz13ljxv7zak17ps36"; libraryHaskellDepends = [ @@ -270234,7 +270879,6 @@ self: { ]; description = "Align and Zip type-classes from the common Semialign ancestor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "semialign-extras" = callPackage @@ -270470,8 +271114,8 @@ self: { pname = "semirings"; version = "0.6"; sha256 = "16q535bvjl7395sqkx6zlw48y4fzr7irp44pcp7w9irpn4cncdcr"; - revision = "1"; - editedCabalFile = "1c06yhfa053sv3rfz0d72a33l5qb0xmj1b3hy2z7pzxrcay6g1yc"; + revision = "2"; + editedCabalFile = "1km8k2j0b7ym1c6gp8m4rx5y1vh8n27ff1w4l2g6865z0fg1d56l"; libraryHaskellDepends = [ base base-compat-batteries containers hashable unordered-containers ]; @@ -270479,6 +271123,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "semirings_0_7" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "semirings"; + version = "0.7"; + sha256 = "1rjxzs1ypgn50nkniln5bbjkxfphs48y0jvf8b3y4v8r4bi0mj4g"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + description = "two monoids as one, in holy haskimony"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "semver" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable , tasty, tasty-hunit, text @@ -270519,8 +271178,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; - version = "0.7.11.5"; - sha256 = "0b0rzry82yyy96kb9aywlggna721bhzvx8af5s6say6ssm7hwsad"; + version = "0.7.11.6"; + sha256 = "07927m3d1v3w28yhiad6gfkkrbm31c1f9zz98yx5hbi4qspxvri9"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = lib.licenses.bsd3; @@ -270913,6 +271572,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "seqn" = callPackage + ({ mkDerivation, base, deepseq, indexed-traversable, primitive + , QuickCheck, quickcheck-classes-base, samsort, tasty + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "seqn"; + version = "0.1.0.0"; + sha256 = "1j42p3dkzrs57a7lszlh61s9d9h117l8wxcf1ya25kszs0an7r8r"; + libraryHaskellDepends = [ + base deepseq indexed-traversable primitive samsort transformers + ]; + testHaskellDepends = [ + base indexed-traversable QuickCheck quickcheck-classes-base tasty + tasty-quickcheck transformers + ]; + description = "Sequences and measured sequences"; + license = lib.licenses.bsd3; + }) {}; + "sequence" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty , tasty-quickcheck, transformers @@ -271136,8 +271815,8 @@ self: { pname = "serialise"; version = "0.2.6.1"; sha256 = "1x3p9vi6daf50xgv5xxjnclqcq9ynqg1qw7af3ppa1nizycrg533"; - revision = "2"; - editedCabalFile = "1y21m10vx4k75x0im5448pl5mhl772hz1hfk47ryb3whz1l6d9vf"; + revision = "3"; + editedCabalFile = "0msmv6shqxpfl8vz46mw4vj398h1fvjgrfv0s4dcsmfql44m1zz3"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive strict text these time unordered-containers vector @@ -273052,8 +273731,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.6"; sha256 = "1hxz3n6l5l8p9s58sjilrn4lv1z17kfik0xdh05v5v1bzf0j2aij"; - revision = "6"; - editedCabalFile = "03sx2hc8kds5yx62zivhc0nj3hd0g0clcrdbccbx1hfnr7bs8ddx"; + revision = "7"; + editedCabalFile = "148mx2hi46l5mdlgikfgilwl3lrvbhqd651qxiky58nr32m07gk0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -276168,6 +276847,17 @@ self: { license = lib.licenses.mit; }) {}; + "shamochu" = callPackage + ({ mkDerivation, base, containers, vector }: + mkDerivation { + pname = "shamochu"; + version = "0.1.0.0"; + sha256 = "0k5sn1jmwk2a1c3xj83lr4pjf1b40kk10gs9x0addywbrfbjwh2p"; + libraryHaskellDepends = [ base containers vector ]; + description = "“Shuffle and merge overlapping chunks” lossless compression"; + license = lib.licenses.bsd3; + }) {}; + "shana" = callPackage ({ mkDerivation, base, directory, regex-posix }: mkDerivation { @@ -278539,12 +279229,14 @@ self: { }) {}; "simple-prompt" = callPackage - ({ mkDerivation, base, exceptions, extra, haskeline, time }: + ({ mkDerivation, base, exceptions, extra, haskeline, safe, time }: mkDerivation { pname = "simple-prompt"; - version = "0.2.2"; - sha256 = "1m8q7jqmdsz3nmsb86i9wy94pxypz172ragx9qfy2v5v0pmc8mww"; - libraryHaskellDepends = [ base exceptions extra haskeline time ]; + version = "0.2.3"; + sha256 = "1ijnfrb6jxrwaj9fnva6mj55a998ld5nwqaxk1x23z57b5wnkacc"; + libraryHaskellDepends = [ + base exceptions extra haskeline safe time + ]; description = "Simple commandline text prompt functions"; license = lib.licenses.bsd3; }) {}; @@ -279240,6 +279932,17 @@ self: { broken = true; }) {}; + "singleraeh" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleraeh"; + version = "0.4.0"; + sha256 = "1ajb4s4b3qqaaylzaipby6c3vgvj7p99ycrvcl6wv3pvq32q4z6s"; + libraryHaskellDepends = [ base ]; + description = "raehik's singletons"; + license = lib.licenses.mit; + }) {}; + "singlethongs" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -279258,10 +279961,8 @@ self: { ({ mkDerivation, base, boring, dec, deepseq, some }: mkDerivation { pname = "singleton-bool"; - version = "0.1.7"; - sha256 = "16xj7d3qnd8nhk66kxm5c145l1060m9yz2yc9y47wsf3hriijb8w"; - revision = "1"; - editedCabalFile = "1aqdd1bzccj8fb2fy1la9gqxvgaa2prba4wig0bnrr5vz13f487c"; + version = "0.1.8"; + sha256 = "0wql2gdy93f62ghv93xcqjm6ajs5glyz8si605wrll9vp79g66r6"; libraryHaskellDepends = [ base boring dec deepseq some ]; description = "Type level booleans"; license = lib.licenses.bsd3; @@ -279343,6 +280044,29 @@ self: { broken = true; }) {}; + "singletons-base_3_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, deepseq, directory + , filepath, pretty, process, singletons, singletons-th, tasty + , tasty-golden, template-haskell, text, th-desugar, turtle + }: + mkDerivation { + pname = "singletons-base"; + version = "3.3"; + sha256 = "sha256-CEfQTbHmTHeGkFn3jer8eGPEt9cDSqhto9c8ULxPB8E"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base pretty singletons singletons-th template-haskell text + th-desugar + ]; + testHaskellDepends = [ + base bytestring deepseq filepath process tasty tasty-golden text + turtle + ]; + description = "A promoted and singled version of the base library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-base_3_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, deepseq, directory , filepath, pretty, process, singletons, singletons-th, tasty @@ -279373,8 +280097,8 @@ self: { }: mkDerivation { pname = "singletons-presburger"; - version = "0.7.3.0"; - sha256 = "00dbagcga3pkbss4asa383vabb42yprv29fp6sqq5drkw6pja32v"; + version = "0.7.4.0"; + sha256 = "1c58ckqnhqsmshdc9fmjd5y0x63i3q1jajj8v9cacybhi8krl0sq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279402,6 +280126,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons-th_3_3" = callPackage + ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons + , syb, template-haskell, th-desugar, th-orphans, transformers + }: + mkDerivation { + pname = "singletons-th"; + version = "3.3"; + sha256 = "sha256-GwtFa5/whjhQDqkK0C5fvrOw/KShkt6x6rwO0t0zO4w="; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl singletons syb template-haskell + th-desugar th-orphans transformers + ]; + description = "A framework for generating singleton types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singletons-th_3_4" = callPackage ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons , syb, template-haskell, th-desugar, th-orphans, transformers @@ -279688,6 +280429,8 @@ self: { pname = "size-based"; version = "0.1.3.2"; sha256 = "1qh2apjkv0m6hi668wq4g7gb75hwhpydv8c5gxn3sgm3cmjscl42"; + revision = "1"; + editedCabalFile = "1h4ig2pqw5spg5mdgwd73q4banvk3kyk7q76pkhy8n0mnwpa51ck"; libraryHaskellDepends = [ base dictionary-sharing template-haskell testing-type-modifiers ]; @@ -279705,8 +280448,8 @@ self: { }: mkDerivation { pname = "sized"; - version = "1.1.0.1"; - sha256 = "0ncgzl6qif9zs78d4hp7vmghv99mx3vvydn3ls37k1fvqqpwz2z9"; + version = "1.1.0.2"; + sha256 = "0644x908zr74bj98apbyr6368lmr9vya7hh6iyykswi6afh7967l"; libraryHaskellDepends = [ base constraints containers deepseq equational-reasoning ghc-typelits-knownnat ghc-typelits-presburger hashable lens @@ -280025,8 +280768,8 @@ self: { pname = "skew-list"; version = "0.1"; sha256 = "1j0rc1s3mpf933wl4fifik62d68hx1py8g8wwxz69ynfhjhf9fa2"; - revision = "2"; - editedCabalFile = "1khmbbfd6f531vmlngcqramazayc2sqvm3j9xwmz1zjxscmvwhsg"; + revision = "3"; + editedCabalFile = "1d44sp9hcf5p72f6km47q5hy2v0xw7slrcbkb6dkvh4mv5cga8iw"; libraryHaskellDepends = [ base deepseq hashable indexed-traversable QuickCheck strict ]; @@ -280336,6 +281079,37 @@ self: { broken = true; }) {ghc-binary = null;}; + "slab" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, blaze-svg + , bytestring, containers, directory, filepath, fsnotify, Glob + , hspec, lens, megaparsec, optparse-applicative, parser-combinators + , pretty-simple, prettyprinter, process, protolude, QuickCheck + , servant, servant-blaze, servant-server, tasty, tasty-silver, text + , transformers, vector, wai, wai-app-static, warp + }: + mkDerivation { + pname = "slab"; + version = "0.0.1.0"; + sha256 = "1yvbh3s579gd6xh8vl9kmyg51jlf8qc2ix94zkcc70q6kfhvp1j0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup blaze-svg bytestring containers + directory filepath fsnotify Glob megaparsec optparse-applicative + parser-combinators pretty-simple prettyprinter process protolude + servant servant-blaze servant-server text transformers vector wai + wai-app-static warp + ]; + executableHaskellDepends = [ base optparse-applicative protolude ]; + testHaskellDepends = [ + base filepath Glob hspec lens optparse-applicative pretty-simple + process protolude QuickCheck tasty tasty-silver text + ]; + description = "A programmable markup language to generate HTML"; + license = lib.licenses.bsd2; + mainProgram = "slab"; + }) {}; + "slack" = callPackage ({ mkDerivation, aeson, base, containers, either, http-conduit, mtl , old-locale, text, time, transformers @@ -280818,8 +281592,8 @@ self: { }: mkDerivation { pname = "slugify"; - version = "0.1.0.1"; - sha256 = "1h5lbp33hd10lr2d5cplac7515aphyd56jyj3wlzw5pg3sih8qvv"; + version = "0.1.0.2"; + sha256 = "1188b76jk05ri3qgiz7g1zxn82sqv7dixxqzh2cx5kl8crk78ivn"; libraryHaskellDepends = [ base text unicode-transforms ]; testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -281494,10 +282268,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "smtlib-backends"; - version = "0.3"; - sha256 = "13pyic8zq0dv7w529pciw0zfpzx63mrf3bq5nillsswbk0czv0qw"; - revision = "2"; - editedCabalFile = "1g2pfmdmqkf3agxnzirgpp9sibjz5m89pjnx7f1i98znk6nswix9"; + version = "0.4"; + sha256 = "16n2ig71wjqp1ziplwrq3639fqn582ymx5g9ls7f814ddjgc70xg"; libraryHaskellDepends = [ base bytestring ]; description = "Low-level functions for SMT-LIB-based interaction with SMT solvers"; license = lib.licenses.mit; @@ -281511,8 +282283,8 @@ self: { pname = "smtlib-backends-process"; version = "0.3"; sha256 = "0jc7fmf3x53w8v0a8cj8v8r2f4gpn1jhndl80hyqzsblvrw5hcfg"; - revision = "2"; - editedCabalFile = "09hszx3ba4d5x11sdv8fagb0nkg1m0q32wc264x5x0pnsv9k3wfa"; + revision = "3"; + editedCabalFile = "1kc9643lrpz8yxcnda54kb2cakxcmbdaxszkhadjmz7in7xv1xi6"; libraryHaskellDepends = [ base bytestring process smtlib-backends ]; @@ -281532,8 +282304,8 @@ self: { pname = "smtlib-backends-tests"; version = "0.3"; sha256 = "0lj4bpl4nkw6w2hfjzz16zmrbaj5g3myvbmzlsc5rdsz0xwisfb8"; - revision = "1"; - editedCabalFile = "0imbf9cgp1imqqj5iryg7k2my4690rwixhl4j3s3a6w54n0zs0sd"; + revision = "2"; + editedCabalFile = "1c7xag17kfvzlz7w8sd9f8nwj3znmfbwlp0049byr9nlmv1nq7lr"; libraryHaskellDepends = [ base smtlib-backends tasty tasty-hunit ]; description = "Testing SMT-LIB backends"; license = lib.licenses.mit; @@ -281547,6 +282319,8 @@ self: { pname = "smtlib-backends-z3"; version = "0.3.1"; sha256 = "1mgjlfhqcbqc84a87g6bp0i9pnmpz87b7w43x200mwx1k877zddy"; + revision = "1"; + editedCabalFile = "18rj2yj3w4cqdirycxavfhwhaalg8v4qjacs25iy3c1qmm3jwrvb"; libraryHaskellDepends = [ base bytestring smtlib-backends ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ @@ -281646,20 +282420,21 @@ self: { "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, crypton-connection, cryptonite, filepath, memory - , mime-mail, network, network-bsd, text + , bytestring, crypton-connection, cryptonite, data-default-class + , filepath, memory, mime-mail, network, network-bsd, text }: mkDerivation { pname = "smtp-mail"; - version = "0.4.0.0"; - sha256 = "0j95vvk2hh1vp4lv59gppfnpavy3mlz4bzlr6l29glz53lmc8bn5"; + version = "0.4.0.1"; + sha256 = "0ynirlf98hpyh2gxxl86ikwwkxc495x3kmg8dfqnifm8ysymia9p"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring - crypton-connection cryptonite filepath memory mime-mail network - network-bsd text + crypton-connection cryptonite data-default-class filepath memory + mime-mail network network-bsd text ]; description = "Simple email sending via SMTP"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "smtp-mail-ng" = callPackage @@ -281865,8 +282640,8 @@ self: { pname = "snap"; version = "1.1.3.3"; sha256 = "1mqckzm9gasa04ls691zgw4c6m53mgcj86yd2p5qvy07mpn9rdvx"; - revision = "1"; - editedCabalFile = "06f9xcj6s7ci01v5gkrd1qhrhnnpwijiac83m6nhjpsisx1d11g3"; + revision = "2"; + editedCabalFile = "01j7lzpdyj5lqqacb9sz6q1nfdscz798sqb0nv3hycbvayi7xiqv"; libraryHaskellDepends = [ aeson attoparsec attoparsec-aeson base bytestring cereal clientsession configurator containers directory directory-tree @@ -283170,6 +283945,8 @@ self: { pname = "snappy-c"; version = "0.1.1"; sha256 = "1ds454nvw5ps0aq51ld7hjml4096z1zc7m7nvf9dc3wi0awzy43f"; + revision = "1"; + editedCabalFile = "1jcsfn3i7qj21n8vpznjs1g9yways15cr3wf4762alq9ghfal4xi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -287305,20 +288082,20 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_1" = callPackage + "stack-all_0_6_3" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd - , simple-cmd-args, text + , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.1"; - sha256 = "0k5gvvl9vh7znscf5b4d3bpsr1mhz58pmh7ny1fdm9p08n3i8dlz"; + version = "0.6.3"; + sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base cached-json-file config-ini directory extra filepath - http-query process simple-cmd simple-cmd-args text + http-query process simple-cmd simple-cmd-args text yaml ]; description = "CLI tool for building over Stackage major versions"; license = lib.licenses.bsd3; @@ -288238,8 +289015,8 @@ self: { }: mkDerivation { pname = "stan"; - version = "0.1.2.1"; - sha256 = "1v1f2a1j7dfi9yxkcm6q9jh4bv9yh2yndj7k5dj2fa889pgq134r"; + version = "0.1.3.0"; + sha256 = "1ah330fmhhqwd603gn3r30d838xig9ipk15is6f1334rdw92893i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288542,8 +289319,8 @@ self: { pname = "statestack"; version = "0.3.1.1"; sha256 = "1747qzaj3xqc90fj4ddch3ra5kj52rfd1dn7a8c6fkdk68q76mfd"; - revision = "2"; - editedCabalFile = "1k60fkszxxyya6amqyjkz5dsxri3c07kgdr6mb1hw4b3dnvq6gwa"; + revision = "3"; + editedCabalFile = "0v43wd19i2pj8f4skxvxjap1rs0jxfwjicpyd9vgdfqji6jaj7a7"; libraryHaskellDepends = [ base mtl transformers ]; description = "Simple State-like monad transformer with saveable and restorable state"; license = lib.licenses.bsd3; @@ -288961,8 +289738,8 @@ self: { }: mkDerivation { pname = "statsd-rupp"; - version = "0.4.0.4"; - sha256 = "1y1c7ln8fany6inshxkmz6dz2g9wpcrrijkgqgfabhvg8nqqgi9w"; + version = "0.5.0.0"; + sha256 = "0clvpmg50p0f1ny9zz5q1niad1ahnkv0dqyphkyrc2snxh896avp"; libraryHaskellDepends = [ base bytestring network unliftio unordered-containers vector ]; @@ -291554,27 +292331,12 @@ self: { }: mkDerivation { pname = "strict-list"; - version = "0.1.7.4"; - sha256 = "0jncppjyzg64d5qxban713z9mxzdky9zlldnnw029l7d1y3yv3x1"; - libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; - testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; - description = "Strict linked list"; - license = lib.licenses.mit; - }) {}; - - "strict-list_0_1_7_5" = callPackage - ({ mkDerivation, base, deepseq, hashable, rerebase, semigroupoids - , tasty, tasty-quickcheck - }: - mkDerivation { - pname = "strict-list"; version = "0.1.7.5"; sha256 = "0sr307zs8jjcwawpzfpgpmyarf0ldk19472i4vzpxvkv7wzgzqy3"; libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; testHaskellDepends = [ rerebase tasty tasty-quickcheck ]; description = "Strict linked list"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strict-mvar" = callPackage @@ -291621,25 +292383,12 @@ self: { ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; - version = "0.1.5.3"; - sha256 = "0hh7grjrripri5sxkvqqf4lqzcvp6c967gmqm002djyvmjfk6b65"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_5_4" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; version = "0.1.5.4"; sha256 = "1znx5lmi7lgn4jzkr73lsc2xac0ypl65bx0pa1hxrc4c74ilysbk"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -291750,6 +292499,19 @@ self: { broken = true; }) {}; + "string-class_0_1_7_2" = callPackage + ({ mkDerivation, base, bytestring, tagged, text }: + mkDerivation { + pname = "string-class"; + version = "0.1.7.2"; + sha256 = "0wi9kkvwf3j77i3z81ijc16pjrn3jwjr6fs8hk78qwf9bklwg3jl"; + libraryHaskellDepends = [ base bytestring tagged text ]; + description = "String class library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "string-combinators" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -291972,6 +292734,7 @@ self: { description = "A library for generating random string from a regular experession"; license = lib.licenses.bsd3; mainProgram = "hstrrand"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "string-similarity" = callPackage @@ -292198,6 +292961,7 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "stripe-core" = callPackage @@ -292350,6 +293114,7 @@ self: { ]; description = "Verification of Stripe webhook signatures"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "stripe-tests" = callPackage @@ -292424,23 +293189,6 @@ self: { }: mkDerivation { pname = "strive"; - version = "6.0.0.11"; - sha256 = "1ddqkyqxbls5slg6gkj7rpvxac104q9haqpc7agggnglznrsc9p5"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - description = "A client for the Strava V3 API"; - license = lib.licenses.mit; - }) {}; - - "strive_6_0_0_12" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; version = "6.0.0.12"; sha256 = "1376pkfkzm3pvhl1k8kqls20vj00zfhyhriccwlzvw918h4f73nc"; libraryHaskellDepends = [ @@ -292449,7 +293197,6 @@ self: { ]; description = "A client for the Strava V3 API"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "strong-path" = callPackage @@ -292509,20 +293256,20 @@ self: { }) {}; "strongweak" = callPackage - ({ mkDerivation, base, either, generic-random, hspec - , hspec-discover, QuickCheck, quickcheck-instances, rerefined, text + ({ mkDerivation, base, generic-random, hspec, hspec-discover + , QuickCheck, quickcheck-instances, rerefined, text , text-builder-linear, vector, vector-sized }: mkDerivation { pname = "strongweak"; - version = "0.7.0"; - sha256 = "0gy6y2dlk2zy7dizyccjb77wf8dzyjx5qi1rxg7xajagpm5nxpzw"; + version = "0.8.0"; + sha256 = "1nws2lkbjfr11jx5ns8qmmik63n158n4abdb1bgmkzkby8621f08"; libraryHaskellDepends = [ - base either rerefined text text-builder-linear vector vector-sized + base rerefined text text-builder-linear vector vector-sized ]; testHaskellDepends = [ - base either generic-random hspec QuickCheck quickcheck-instances - rerefined text text-builder-linear vector vector-sized + base generic-random hspec QuickCheck quickcheck-instances rerefined + text text-builder-linear vector vector-sized ]; testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; @@ -293111,8 +293858,8 @@ self: { }: mkDerivation { pname = "subcategories"; - version = "0.2.1.0"; - sha256 = "18bvpib34nc60s7hkg1c6ypyn26k90gwdsydcrld65a29ddf615a"; + version = "0.2.1.1"; + sha256 = "14n1f28wbk0jczig211jj4181ljnczy18hy5pi1y1c6pmbj9mxci"; libraryHaskellDepends = [ base containers data-default foldl hashable mono-traversable pointed primitive reflection semialign template-haskell text these @@ -294243,8 +294990,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; - revision = "8"; - editedCabalFile = "0h6bymf2him9shr8sfhw4h61ysp7hkzk0y1jwyv13d5l84yzi52g"; + revision = "9"; + editedCabalFile = "0ca6bgv5xrk6pz12j35jv1gbp06z6kk7fs7nc1bwjjxy6c6x4vm5"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -294273,8 +295020,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "3.8.3"; - sha256 = "0483mpcinsq06jahk58811r8l4bk6ajp6hilvs0sgc0543p4jj6i"; + version = "3.9"; + sha256 = "1iyj0g9plzvih50j9sx41dpksj4avllr9csf8sp577zrq334r1l1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -295932,13 +296679,19 @@ self: { }) {}; "symparsec" = callPackage - ({ mkDerivation, base, defun-core, type-spec }: + ({ mkDerivation, base, defun-core, singleraeh, type-level-show + , type-spec + }: mkDerivation { pname = "symparsec"; - version = "0.4.0"; - sha256 = "0ap3j2163vqpr27rij8ld3m6jyd7jnbndx8s7ix6xzjyhdijmkjw"; - libraryHaskellDepends = [ base defun-core ]; - testHaskellDepends = [ base defun-core type-spec ]; + version = "1.1.1"; + sha256 = "0v22lqpb61788s3vpvd9pcdf5cyrz09myzykz3mfi6xfd2dsjby3"; + libraryHaskellDepends = [ + base defun-core singleraeh type-level-show + ]; + testHaskellDepends = [ + base defun-core singleraeh type-level-show type-spec + ]; description = "Type level string parser combinators"; license = lib.licenses.mit; }) {}; @@ -296940,6 +297693,28 @@ self: { mainProgram = "systemstats"; }) {}; + "systranything" = callPackage + ({ mkDerivation, aeson, base, bytestring, extra + , gi-ayatana-appindicator3, gi-gdk, gi-glib, gi-gobject, gi-gtk + , optparse-applicative, text, typed-process, unliftio, yaml + }: + mkDerivation { + pname = "systranything"; + version = "0.1.0.0"; + sha256 = "1p6y9hvkn12n1dwnkwij2qjjdvhzqwq9sxqmlzrkclbmkmivcanj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring extra gi-ayatana-appindicator3 gi-gdk gi-glib + gi-gobject gi-gtk optparse-applicative text typed-process unliftio + yaml + ]; + description = "Let you put anything in the system tray"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "systranything"; + }) {}; + "syz" = callPackage ({ mkDerivation, base, syb }: mkDerivation { @@ -298352,15 +299127,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "tar_0_6_2_0" = callPackage + "tar_0_6_3_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, file-embed, filepath, os-string, QuickCheck, tasty , tasty-bench, tasty-quickcheck, temporary, time, transformers }: mkDerivation { pname = "tar"; - version = "0.6.2.0"; - sha256 = "160rxxaxq7aiz9zca7hxa5abllzqmb77rzp9hmzgxmlynn11xih8"; + version = "0.6.3.0"; + sha256 = "05387za01dssa2nhgqcsshwpxakfk4djad39dm0j99f8xq7ndfsh"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath os-string time transformers @@ -298721,16 +299496,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "tasty_1_5" = callPackage + "tasty_1_5_1" = callPackage ({ mkDerivation, ansi-terminal, base, containers , optparse-applicative, stm, tagged, transformers, unix }: mkDerivation { pname = "tasty"; - version = "1.5"; - sha256 = "1b19s0kf61z3zp7qx9m3j3iqmjvwvqsfwryf9lfnj3i15a2zfp6a"; - revision = "2"; - editedCabalFile = "0jr6a6klg08x9pqmap3h3ys5dhda0w92ysbnsvvi81vrzxzz98wd"; + version = "1.5.1"; + sha256 = "1pb14rp2y87nbgwy3pkyhm69ly53knnnahidrihdd1nd378svpl9"; libraryHaskellDepends = [ ansi-terminal base containers optparse-applicative stm tagged transformers unix @@ -298790,34 +299563,6 @@ self: { }: mkDerivation { pname = "tasty-autocollect"; - version = "0.4.2"; - sha256 = "021yrrw53k8bppqpqqiny0gwbphhwq76g08m3d2ycfn57f9hxnbs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath ghc tasty - tasty-expected-failure template-haskell text transformers - ]; - executableHaskellDepends = [ base text ]; - testHaskellDepends = [ - base bytestring containers directory explainable-predicates - filepath tasty tasty-golden tasty-hunit tasty-quickcheck temporary - text typed-process - ]; - description = "Autocollection of tasty tests"; - license = lib.licenses.bsd3; - mainProgram = "tasty-autocollect"; - }) {}; - - "tasty-autocollect_0_4_3" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , explainable-predicates, filepath, ghc, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, transformers - , typed-process - }: - mkDerivation { - pname = "tasty-autocollect"; version = "0.4.3"; sha256 = "0pidvmxkyddx3kdyhhx335cn8hyi66y4n2xvpdk5sg1zg2w29ggl"; isLibrary = true; @@ -298834,7 +299579,6 @@ self: { ]; description = "Autocollection of tasty tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "tasty-autocollect"; }) {}; @@ -299093,8 +299837,8 @@ self: { pname = "tasty-hedgehog"; version = "1.4.0.2"; sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"; - revision = "3"; - editedCabalFile = "1ij1h7kdbg4bd93fl9991b39xn1rkawshsh3hgbz3j2inmnljx2w"; + revision = "4"; + editedCabalFile = "1qibqxwh3f0c2n7fcj2dni12mhixfwbywli6qrqii6wi7n325gd9"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -299240,6 +299984,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-hunit_0_10_2" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.2"; + sha256 = "1xh33ss7dncm7zanzkzh7ywb3a46k7vkcbh6v8jb767gq6kizw2s"; + libraryHaskellDepends = [ base call-stack tasty ]; + description = "HUnit support for the Tasty test framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -299545,20 +300301,20 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-quickcheck_0_10_3" = callPackage + "tasty-quickcheck_0_11" = callPackage ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck , random, tagged, tasty, tasty-hunit }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.10.3"; - sha256 = "02lw6gk83b6wc9dwd3shin58zqy9isgx4zh7z0whs0wkzwzkpyyg"; - revision = "2"; - editedCabalFile = "0j2g1cngc5xk190jsm2k7kh25y1afmbr37abi09wvlyq8ja4n59r"; + version = "0.11"; + sha256 = "07liq4wjz7wad8xwgwb5x9ijl8626cfd9f5gb37mjqc23ab268lx"; libraryHaskellDepends = [ base optparse-applicative QuickCheck random tagged tasty ]; - testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + testHaskellDepends = [ + base pcre-light QuickCheck tasty tasty-hunit + ]; description = "QuickCheck support for the Tasty test framework"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -299677,7 +300433,6 @@ self: { doHaddock = false; description = "Tests defined by Search Using Golden Answer References"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-tap" = callPackage @@ -300300,6 +301055,8 @@ self: { pname = "teeth"; version = "0.2.0.2"; sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c"; + revision = "1"; + editedCabalFile = "0g8z22ppi6p6cm11a444kr7dfk60fbxs8lbar9ssw7lfbd8738h9"; libraryHaskellDepends = [ base ]; description = "Dental data types"; license = lib.licenses.mit; @@ -300422,8 +301179,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.0"; - sha256 = "0kzn0zhnq4g3l85jbdfz420449aamv5kah3qdk05ysmx2msd4s66"; + version = "7.4"; + sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -300446,8 +301203,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.13"; - sha256 = "0gf272hhfavx5lki7dlxcn760gjk613md391nvmxnmnvyhs6g5rz"; + version = "0.14.1"; + sha256 = "0v025wkhjnxjqzisj3x1gfv1qk9c17j2czdf0iv5fsxdkz2vc949"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -300855,26 +301612,27 @@ self: { "templatise" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, directory , exceptions, extra, filepath, hspec, http-client, http-conduit - , mtl, network-uri, optparse-applicative, parsec, process, tasty - , tasty-golden, tasty-hspec, temporary, text, time + , MissingH, monad-logger, mtl, network-uri, optparse-applicative + , parsec, process, regex-tdfa, tasty, tasty-golden, tasty-hspec + , temporary, text, time }: mkDerivation { pname = "templatise"; - version = "0.1.2.0"; - sha256 = "0plgfhvdhs8bwyldcc84scmaw7cw1rva7m3rxx14jn3dhc2k65qj"; + version = "0.1.5.0"; + sha256 = "092vbmng2jpcb2vc9bqg2gm132zrvi3b9qh7lfw6d1as9qf8f43v"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal-syntax exceptions extra filepath http-client - http-conduit mtl network-uri optparse-applicative parsec process - text time + http-conduit monad-logger mtl network-uri optparse-applicative + parsec process regex-tdfa text time ]; - executableHaskellDepends = [ base filepath optparse-applicative ]; + executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ - base bytestring Cabal-syntax directory filepath hspec mtl - network-uri optparse-applicative process tasty tasty-golden - tasty-hspec temporary text time + base bytestring Cabal-syntax directory filepath hspec MissingH + monad-logger mtl network-uri optparse-applicative process tasty + tasty-golden tasty-hspec temporary text time ]; doHaddock = false; description = "You can use template.hs to create a new Haskell GitHub repository."; @@ -301436,6 +302194,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "tensort" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, random, random-shuffle + , time + }: + mkDerivation { + pname = "tensort"; + version = "0.2.0.3"; + sha256 = "0qkm7iy00z13drs1f3fd3zl6cc45c7s2k8pn6ya7pmpji424dwiw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl random random-shuffle ]; + executableHaskellDepends = [ base time ]; + testHaskellDepends = [ base mtl QuickCheck ]; + description = "Tunable sorting for responsive robustness and beyond!"; + license = lib.licenses.mit; + mainProgram = "tensort"; + }) {}; + "term-rewriting" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit , mtl, multiset, parsec, QuickCheck, union-find-array @@ -301927,8 +302703,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "11"; - editedCabalFile = "1p0a12cf6h2wfhrym8zl1iv0isg5mxs3ydzp770q6ahkm4lqsfz6"; + revision = "12"; + editedCabalFile = "16g2xbsmyjal05xka6ib0vca8bjnspsin4aph1xjgqvnma6jv9lz"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -302896,6 +303672,30 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder-dev_0_3_4_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, criterion + , deferred-folds, isomorphism-class, QuickCheck, quickcheck-classes + , quickcheck-instances, rerebase, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers + }: + mkDerivation { + pname = "text-builder-dev"; + version = "0.3.4.3"; + sha256 = "1hsr4yp79lva57nkjcm5iqpphfdxq53gzjj4wx0smn6yvry1anpy"; + libraryHaskellDepends = [ + base bytestring deferred-folds isomorphism-class QuickCheck + quickcheck-instances split text time transformers + ]; + testHaskellDepends = [ + base-compat quickcheck-classes quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Edge of developments for \"text-builder\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-builder-linear" = callPackage ({ mkDerivation, base, bytestring, quote-quot, tasty, tasty-bench , tasty-quickcheck, text @@ -303154,32 +303954,6 @@ self: { }: mkDerivation { pname = "text-iso8601"; - version = "0.1"; - sha256 = "1kszvadfl2ihmyd1chd6am6qkdvd9zwa5q1954yz3waiz537m3pm"; - revision = "1"; - editedCabalFile = "0xlz7g29bihgn22h1p2rdlvgggi6g1zdsag01lydnld71i8g51mc"; - libraryHaskellDepends = [ - base integer-conversion text time time-compat - ]; - testHaskellDepends = [ - base QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck text time-compat - ]; - benchmarkHaskellDepends = [ - attoparsec attoparsec-iso8601 base tasty-bench text time-compat - ]; - description = "Converting time to and from ISO 8601 text"; - license = lib.licenses.bsd3; - }) {}; - - "text-iso8601_0_1_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base - , integer-conversion, QuickCheck, quickcheck-instances, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, time - , time-compat - }: - mkDerivation { - pname = "text-iso8601"; version = "0.1.1"; sha256 = "00l2m3xj39mrz7lbmbnir4k9jbn3jm3xa2q6zkh0zr7arsvx5slx"; libraryHaskellDepends = [ @@ -303194,7 +303968,6 @@ self: { ]; description = "Converting time to and from ISO 8601 text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-json-qq" = callPackage @@ -303343,8 +304116,8 @@ self: { pname = "text-metrics"; version = "0.3.2"; sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx"; - revision = "3"; - editedCabalFile = "1hdxv7jka6x7d621cxn4r802w4rip45calmvjrb8aar34dshkg4q"; + revision = "4"; + editedCabalFile = "1blvnlylfs5s91q4n48la7pcl2sz5gajmjdx9jagcml5nmsnirqq"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -304170,6 +304943,8 @@ self: { pname = "th-deepstrict"; version = "0.1.1.0"; sha256 = "0y0wlgzsm44sbwbchg4pqyb0s398aqjmd1awgd019bp29gzkd1hp"; + revision = "1"; + editedCabalFile = "0fip82wksknywr9wqmwsyf7847j5abhsqpbhbv8l9hlfhz6889d9"; libraryHaskellDepends = [ base containers mtl template-haskell th-abstraction th-orphans ]; @@ -304206,6 +304981,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-desugar_1_16" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl + , ordered-containers, syb, template-haskell, th-abstraction + , th-orphans, transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.16"; + sha256 = "sha256-TsuH4NNhJ4xApiQQzbVYACns1jDP0sYZzkGBJRiGghA"; + libraryHaskellDepends = [ + base containers ghc-prim mtl ordered-containers syb + template-haskell th-abstraction th-orphans transformers-compat + ]; + testHaskellDepends = [ + base containers ghc-prim hspec HUnit mtl syb template-haskell + th-abstraction th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-desugar_1_17" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl , ordered-containers, syb, template-haskell, th-abstraction @@ -304440,6 +305237,8 @@ self: { pname = "th-letrec"; version = "0.1.1"; sha256 = "0z4zh9lnp60nih7dwy697jbnk19f1h3ypazw23jbf0z93f7d90b6"; + revision = "1"; + editedCabalFile = "1zghhmlqzz5lfq8zbbxnbyl9naf9ixjpawi6l00z2b31l0wspfsr"; libraryHaskellDepends = [ base codet containers some template-haskell transformers ]; @@ -304904,75 +305703,33 @@ self: { ({ mkDerivation, assoc, base, binary, deepseq, hashable }: mkDerivation { pname = "these"; - version = "1.2"; - sha256 = "1f6lmjmy3yl1d2ycfsfk7q4sd0m3zrrap2plc11pd47pnxs73vd8"; - revision = "1"; - editedCabalFile = "0vpcgbyrykzzyycwda8k6dcjvjcncrwlish4gkw2i80wi7v247h1"; - libraryHaskellDepends = [ assoc base binary deepseq hashable ]; - description = "An either-or-both data type"; - license = lib.licenses.bsd3; - }) {}; - - "these_1_2_1" = callPackage - ({ mkDerivation, assoc, base, binary, deepseq, hashable }: - mkDerivation { - pname = "these"; version = "1.2.1"; sha256 = "1pp44amwvpl0m762zahg632prlxx0ca2r10n3a0bznjy6qrxkmhp"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-lens" = callPackage ({ mkDerivation, base, lens, these }: mkDerivation { pname = "these-lens"; - version = "1.0.1.3"; - sha256 = "1pka56z7nrwapiqihp1d7jcindv9m6njy693561q4km2m3rhs5dq"; - revision = "1"; - editedCabalFile = "0gchaa8b7gynryhm9ddkblbs3mivy6aqlj0digwv271c0qzx9bjg"; - libraryHaskellDepends = [ base lens these ]; - description = "Lenses for These"; - license = lib.licenses.bsd3; - }) {}; - - "these-lens_1_0_2" = callPackage - ({ mkDerivation, base, lens, these }: - mkDerivation { - pname = "these-lens"; version = "1.0.2"; sha256 = "159dp25rbhcnmpxvvabjl8s9df9mvqi30p81vrmh7kgg86xa050y"; libraryHaskellDepends = [ base lens these ]; description = "Lenses for These"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-optics" = callPackage ({ mkDerivation, base, optics-core, these }: mkDerivation { pname = "these-optics"; - version = "1.0.1.2"; - sha256 = "06jxv320a8f94zjjsqrh072vz2dkzhwgcmpbdy1prgvypiynm4zd"; - revision = "3"; - editedCabalFile = "0srsap1s1vi96xbw9vzpk14jyxajqlpmwn1bw190qjqnilxkqg48"; - libraryHaskellDepends = [ base optics-core these ]; - description = "Optics for These"; - license = lib.licenses.bsd3; - }) {}; - - "these-optics_1_0_2" = callPackage - ({ mkDerivation, base, optics-core, these }: - mkDerivation { - pname = "these-optics"; version = "1.0.2"; sha256 = "0a63xfqj841i7pwdjzg067ixs0lj9ngwfjps6yyk5gyqqmhirqsv"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "these-skinny" = callPackage @@ -305352,6 +306109,8 @@ self: { pname = "threepenny-gui"; version = "0.9.4.1"; sha256 = "199jpgzmjlraspazaq9crv1zl92xmi8k2fif5kvznzpjvl4b1k1k"; + revision = "1"; + editedCabalFile = "1y0kc86hry2n2d5xrgly5y2zax52q4jjgl7j0984znqdmqk6b8jb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -306733,21 +307492,6 @@ self: { }: mkDerivation { pname = "timer-wheel"; - version = "1.0.0"; - sha256 = "1fl2incjl0zsrhk6kzhv1g9wzmsvyambak4z75fw3b5s306hw763"; - libraryHaskellDepends = [ atomic-primops base ki primitive ]; - testHaskellDepends = [ base ki random ]; - benchmarkHaskellDepends = [ base ki random tasty-bench ]; - description = "A timer wheel"; - license = lib.licenses.bsd3; - }) {}; - - "timer-wheel_1_0_0_1" = callPackage - ({ mkDerivation, atomic-primops, base, ki, primitive, random - , tasty-bench - }: - mkDerivation { - pname = "timer-wheel"; version = "1.0.0.1"; sha256 = "0sshn0i25f4bdb6wj6xg4shkq5ylpiq4803wp6ra1qvyg9kbx5za"; libraryHaskellDepends = [ atomic-primops base ki primitive ]; @@ -306755,7 +307499,6 @@ self: { benchmarkHaskellDepends = [ base ki random tasty-bench ]; description = "A timer wheel"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "timerep" = callPackage @@ -306899,8 +307642,8 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "timestats"; - version = "0.1.3"; - sha256 = "11qif48pc5fisighqw5c7iq9asbfzpnx2w6wxasw0gfpwmphcwyf"; + version = "0.2.0"; + sha256 = "085jbizsxn7hxn8i8621gbyss924qzysc56c81lg13xng7s8b3f3"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base text ]; description = "A library for profiling time in Haskell applications"; @@ -307140,6 +307883,18 @@ self: { broken = true; }) {}; + "tinyapp" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tinyapp"; + version = "0.1.0.2"; + sha256 = "1xsh0fv5zmcpgcm5xq3xap5fx9y1v8z14pdqa9xsy7v509g4c8l1"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Library to build tiny apps in Haskell"; + license = lib.licenses.mit; + }) {}; + "tinyfiledialogs" = callPackage ({ mkDerivation, base, c2hs, text }: mkDerivation { @@ -307641,7 +308396,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tls_2_0_5" = callPackage + "tls_2_0_6" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -307650,10 +308405,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.0.5"; - sha256 = "1qgwgbhp19a28ibb73h1ahkrwsjnv3hndfj3bsp9fb1s4856vn6z"; - revision = "1"; - editedCabalFile = "0717sfkj6jzpnp0r5013m3z6s25fnnrcd07lfdlpzxhs5fdjnk36"; + version = "2.0.6"; + sha256 = "07cznhk0jf2ffkpmq3q9iz9r4zcls8rkh32s3qqwaahp8lnvmsm3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307722,6 +308475,8 @@ self: { pname = "tls-session-manager"; version = "0.0.4"; sha256 = "134kb5nz668f4xrr5g98g7fc1bwb3ri6q433a1i6asjkniwpy85s"; + revision = "1"; + editedCabalFile = "1pg11vlx2hjy3qf73x8wd8jfabm94mng09gny2zn5jv9z3amw8l1"; libraryHaskellDepends = [ auto-update base basement bytestring clock memory psqueues tls ]; @@ -307871,7 +308626,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "tmp-proc_0_7_0_0" = callPackage + "tmp-proc_0_7_1_0" = callPackage ({ mkDerivation, async, base, bytestring, crypton-connection , crypton-x509-system, data-default, directory, filepath, fmt , hspec, http-client, http-client-tls, http-types, mtl, mustache @@ -307880,8 +308635,8 @@ self: { }: mkDerivation { pname = "tmp-proc"; - version = "0.7.0.0"; - sha256 = "1vfaid9x5mcnn2r1h7a788rxrgds631adwzhmhn6fqzivysmqk6g"; + version = "0.7.1.0"; + sha256 = "0l7grkyl0n1h6nbhfi8ivn3wxdkjzhhwfnbxrlbvf2pbiidgj6bc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -308553,17 +309308,15 @@ self: { license = lib.licenses.isc; }) {}; - "toml-parser_2_0_0_0" = callPackage + "toml-parser_2_0_1_0" = callPackage ({ mkDerivation, alex, array, base, containers, happy, hspec , hspec-discover, markdown-unlit, prettyprinter, template-haskell , text, time, transformers }: mkDerivation { pname = "toml-parser"; - version = "2.0.0.0"; - sha256 = "1nvrmlgmdvm7p16fywds4wnpyavyq7sk0p3zlqy9dci33qb3kzc7"; - revision = "2"; - editedCabalFile = "027xradr3xivfb68nljplrj6qr8kr32k0ifdl8bwki442rkbhfqv"; + version = "2.0.1.0"; + sha256 = "1qcpcrcalds3a2gdx83iynpj3hvkg6hbyza8al0f7jdsg9r6sdh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -308645,20 +309398,18 @@ self: { "tomland" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec - , megaparsec, mtl, parser-combinators, text, time, transformers + , megaparsec, mtl, parser-combinators, text, time , unordered-containers, validation-selective }: mkDerivation { pname = "tomland"; - version = "1.3.3.2"; - sha256 = "152jqjv6n7n2hdysn903wfhpwh6vp8wmjiymzasazprasdcxpywm"; - revision = "5"; - editedCabalFile = "1y42r0wkzjnjinld9jh01gjxs9mw8qv200nq4dj6prp5d2rbgdd3"; + version = "1.3.3.3"; + sha256 = "1asnz773mrbg8fkfabq5w24v63sgqljspc4p4nmf4dm6abm2p6d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers + parser-combinators text time unordered-containers validation-selective ]; testHaskellDepends = [ @@ -308992,17 +309743,13 @@ self: { }) {}; "topaz" = callPackage - ({ mkDerivation, aeson, base, binary, hashable, quantification - , vector - }: + ({ mkDerivation, base, binary, hashable, quantification, vector }: mkDerivation { pname = "topaz"; - version = "0.7.0"; - sha256 = "18l900v86m4dil4bvr6wcwqinbzls85fqz5bc5vvqhkx8vgglm7j"; - revision = "1"; - editedCabalFile = "0cpcngy2qc7bxxr8m01v0kyq4nx2jvb2p69dfzkjn0m3hcw58fig"; + version = "0.8.0.1"; + sha256 = "0dmv98miak251gps6cbpnax49rm3dq250g45kx45g6g54hx0dc3m"; libraryHaskellDepends = [ - aeson base binary hashable quantification vector + base binary hashable quantification vector ]; description = "Extensible records library"; license = lib.licenses.bsd3; @@ -309013,8 +309760,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.7.0"; - sha256 = "1jrqna3lxjxsiqxb6ybwm7kl59r3948lqhqb8l5xv9v5r38vzr6d"; + version = "1.0.8.0"; + sha256 = "0cqa5dwsc95hvixbxfmjqrp1lrjfzcgx01z3mkm062ybb4smk5k9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -309047,18 +309794,12 @@ self: { }) {}; "topograph" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , vector - }: + ({ mkDerivation, base, base-orphans, containers, vector }: mkDerivation { pname = "topograph"; - version = "1.0.0.2"; - sha256 = "08fpwaf6341gaf7niwss08zlfyf8nvfrc4343zlkhscb19l4b7ni"; - revision = "2"; - editedCabalFile = "1l98l1rky1y9npckf40d3dizy27xh4byqkfz419n1d6ks8fi15w6"; - libraryHaskellDepends = [ - base base-compat base-orphans containers vector - ]; + version = "1.0.1"; + sha256 = "02nywgf9k20lx75cq8y3kpqv4q7zzpkvszyxnzml2x1b1ybb1blm"; + libraryHaskellDepends = [ base base-orphans containers vector ]; description = "Directed acyclic graphs"; license = lib.licenses.bsd3; }) {}; @@ -310575,6 +311316,35 @@ self: { license = lib.licenses.gpl2Plus; }) {}; + "tree-diff_0_3_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , bytestring, containers, criterion, deepseq, Diff, hashable + , parsec, parsers, pretty, primitive, QuickCheck, scientific + , semialign, strict, tagged, tasty, tasty-golden, tasty-quickcheck + , text, these, time, trifecta, unordered-containers, uuid-types + , vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.3.1"; + sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base bytestring containers + deepseq hashable parsec parsers pretty primitive QuickCheck + scientific semialign strict tagged text these time + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base parsec primitive QuickCheck + tagged tasty tasty-golden tasty-quickcheck trifecta + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; + description = "Diffing of (expression) trees"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -312226,8 +312996,8 @@ self: { pname = "turtle"; version = "1.6.2"; sha256 = "0bav7b2ghbwdhpa4b5a7812psr6hqk7wydvgxjy5dsb62nqnc08s"; - revision = "2"; - editedCabalFile = "14jnb2vyq0nx4cp4c97xflzg7z9xw1avg2d27c1d1cnqg28pd4an"; + revision = "3"; + editedCabalFile = "19i3n3hd2a0rkdz1ikwdgwhg4ds5pcfah25vgk0jnmwf71h0qwbm"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions filepath foldl hostname managed optional-args @@ -313534,12 +314304,12 @@ self: { }) {}; "type-level-show" = callPackage - ({ mkDerivation, base, defun-core }: + ({ mkDerivation, base, defun-core, singleraeh }: mkDerivation { pname = "type-level-show"; - version = "0.1.1"; - sha256 = "150k54mf15pj2jghhvr76y9yvljn4q25vrg3zwmvbn93gd1zhy20"; - libraryHaskellDepends = [ base defun-core ]; + version = "0.3.0"; + sha256 = "09yxl90lzrscpb7wwaq3bchhf6qq0hj1pnxzkynkalcpdbac2d1m"; + libraryHaskellDepends = [ base defun-core singleraeh ]; description = "Utilities for writing Show-like type families"; license = lib.licenses.mit; }) {}; @@ -313595,6 +314365,8 @@ self: { pname = "type-natural"; version = "1.3.0.1"; sha256 = "0n07bcz5hi4l2a2lvgqkns4b158nsw10f1m7ij1vagwwvzsl0msf"; + revision = "1"; + editedCabalFile = "037mnys2dmkff7m52wqmr0x0sc2s9ld4iid00rf0482d7gz72wlm"; libraryHaskellDepends = [ base constraints equational-reasoning ghc ghc-typelits-knownnat ghc-typelits-natnormalise ghc-typelits-presburger @@ -314459,6 +315231,7 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "types-compat" = callPackage @@ -316052,6 +316825,8 @@ self: { pname = "unicode-collation"; version = "0.1.3.6"; sha256 = "0c1s1n4cqhjibiv05h5qfl4cg4h11ny4jay0gqnqg36z9kb66hfn"; + revision = "1"; + editedCabalFile = "01s776d2bifbvpy0mvpbc7yf748j5j2x4hf2fz6bzxm1rrlzrxmf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -316108,6 +316883,17 @@ self: { broken = true; }) {}; + "unicode-data-parser" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "unicode-data-parser"; + version = "0.3.0.2"; + sha256 = "1zz5n9x4pn1whyam0kkbsml8iawk1savzp7xc7idvripdm61dd31"; + libraryHaskellDepends = [ base bytestring ]; + description = "Parsers for Unicode Character Database (UCD) files"; + license = lib.licenses.bsd3; + }) {}; + "unicode-data-scripts" = callPackage ({ mkDerivation, base, deepseq, hspec, tasty, tasty-bench , unicode-data @@ -317659,8 +318445,8 @@ self: { }: mkDerivation { pname = "unix-time"; - version = "0.4.12"; - sha256 = "1qlpmwd43kaybbq7vaa1wnbay575qwj4r7xynafixa6bwnc759ah"; + version = "0.4.15"; + sha256 = "0rkjjwbw4s1k13f0syy409yiqj7v9x8ghi209j3lxkh1xq9caq17"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ base bytestring hspec old-locale old-time QuickCheck @@ -317840,8 +318626,8 @@ self: { pname = "unliftio-core"; version = "0.2.1.0"; sha256 = "1qz3gxcq1x8fjgq6fqsnws5vgkgbjcx332p3hldxdnaninx4qf4r"; - revision = "3"; - editedCabalFile = "1ph6pfz8rj697wg0p8df6l4slj9708l8q951vpxpn3qfn8rhd018"; + revision = "4"; + editedCabalFile = "0ah7x2k1p5d43iwr2xr12z5fk5jdxb9l7jjd73cr0lwbhmpp78pn"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = lib.licenses.mit; @@ -319213,8 +319999,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.7"; - sha256 = "12ijma954vss6a2nicq17q5pz3l7qjgh1f6s8lcrrxcf8vc10m1c"; + version = "0.1.3.8"; + sha256 = "1cwjz221ij395z9nsi71dl9gsgp9cmz0x65b7v7f21qziw54vwqq"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -319578,10 +320364,12 @@ self: { pname = "utxorpc"; version = "0.0.5.1"; sha256 = "1k46h256vdzwqbg7g44la8k41rlwwa4xjpzl1506zr3dsxvjgab2"; + revision = "4"; + editedCabalFile = "0sz7igbax3gd3cciygy5avwp9bhm26vrn98i05zxw1a78b47py98"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; - description = "A gRPC interface for UTxO Blockchains"; + description = "Generated code for a gRPC interface for UTxO Blockchains"; license = lib.licenses.asl20; }) {}; @@ -319623,8 +320411,8 @@ self: { }: mkDerivation { pname = "utxorpc-server"; - version = "0.0.2.0"; - sha256 = "1sbbyhf4av2vrqnz2g7gzm0q28bchw2jqnyqr42az7jddki9r93l"; + version = "0.0.3.0"; + sha256 = "0a56c871ypq0rfjl8lc5xxzx0vqggx74anxkbymvrad7h0bhsjyz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -320966,8 +321754,8 @@ self: { pname = "vault"; version = "0.3.1.5"; sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; - revision = "6"; - editedCabalFile = "10l6j8hdfraxfnzqq0l01y546q7rqgv95bci71gfs7lm15vnw2d3"; + revision = "7"; + editedCabalFile = "0jbbjmh3h9pkj1mfafysny20ynfl58ifchizn13dkqvclpkr770h"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -321270,14 +322058,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "vec_0_5_1" = callPackage + ({ mkDerivation, adjunctions, base, boring, criterion, deepseq + , distributive, fin, hashable, indexed-traversable + , inspection-testing, QuickCheck, semigroupoids, tagged + , transformers, vector + }: + mkDerivation { + pname = "vec"; + version = "0.5.1"; + sha256 = "0rswq31fjsqzzq88b920hz0j8v0rdjhb04v4fr10cdqbnxaqglb0"; + libraryHaskellDepends = [ + adjunctions base boring deepseq distributive fin hashable + indexed-traversable QuickCheck semigroupoids transformers + ]; + testHaskellDepends = [ base fin inspection-testing tagged ]; + benchmarkHaskellDepends = [ base criterion fin vector ]; + description = "Vec: length-indexed (sized) list"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vec-lens" = callPackage ({ mkDerivation, base, fin, lens, vec }: mkDerivation { pname = "vec-lens"; - version = "0.4"; - sha256 = "1qjv8wg6b8wbldvripn84vyw5cgpcpgh2v6v1nk7pzwrn99lfb7h"; - revision = "4"; - editedCabalFile = "1mh9wswfvcxw7656qqpggykndcpc5jsc5i0wxrnlzyg0ijh22qcs"; + version = "0.4.1"; + sha256 = "1llppbk2qdkymgy66w5dl2w7x3r70mf5rqzp6ppllvzhjm7fg9vw"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = lib.licenses.bsd3; @@ -321287,10 +322094,8 @@ self: { ({ mkDerivation, base, fin, optics-core, vec }: mkDerivation { pname = "vec-optics"; - version = "0.4"; - sha256 = "0vdpxkmhiqbql68rkrfaci6c6n7sbr49p08q0jj6cvbmjy3aa1lg"; - revision = "4"; - editedCabalFile = "0szgvkhqnn2igjzvm86fbiqpybfjwl5n2dscr614bda6yhqlvk00"; + version = "0.4.1"; + sha256 = "1s0q34r54bsj43lzzzg9wcssc2lcgqgvx556xzdkyhs69rcc3r11"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = lib.licenses.bsd3; @@ -321376,10 +322181,10 @@ self: { }: mkDerivation { pname = "vector-algorithms"; - version = "0.9.0.1"; - sha256 = "0h9qqgna787q93q58mrvmg5mw8h92vlapx2glanz6vpjm39w19rb"; - revision = "3"; - editedCabalFile = "1fixldpkbw3yqj27vh5c8wb6vw8djdjprfjgs1rkvqdrq2j02ar2"; + version = "0.9.0.2"; + sha256 = "0fi5gahk5spqy9jz6alvhp3sligyq9n1ib1w3mw48jbkp060vvl2"; + revision = "1"; + editedCabalFile = "11vfdv6d1dhcb6bkl4x0z22bni9gsl1qrq3r0wb4bj9ncb7nfqk3"; libraryHaskellDepends = [ base bitvec bytestring primitive vector ]; @@ -322009,8 +322814,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.4.0.0"; - sha256 = "0sjwgcvymyl74hgfc93l6nj5422d044dkj02mlzvrcfdqhicz96d"; + version = "0.4.0.1"; + sha256 = "17sfx8jn8kd6r2ik3iad3zzrpxr7qp4h8aka0jag78h0cpnapz3n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -322340,8 +323145,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "6.0.6"; - sha256 = "0w73gcg2yyrx5b6msynmpa05q2q1n4qaa59n0l21glz28k7lzyma"; + version = "6.0.7"; + sha256 = "1gn2xjgsgvjh0sav16kjmldviy1fbib6jlfd25c879a2a631b5p0"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators template-haskell text @@ -324121,37 +324926,6 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.14"; - sha256 = "1db4iz6ls98n2y08fcb53gip0kf2sagvk1a82xzl25nf14dza12p"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class directory - fast-logger http-types HUnit iproute network resourcet - streaming-commons text time transformers unix vault wai wai-logger - warp word8 - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive cookie directory fast-logger - hspec http-types HUnit iproute resourcet temporary text time wai - warp word8 zlib - ]; - testToolDepends = [ hspec-discover ]; - description = "Provides some basic WAI handlers and middleware"; - license = lib.licenses.mit; - }) {}; - - "wai-extra_3_1_15" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, directory, fast-logger, hspec, hspec-discover - , http-types, HUnit, iproute, network, resourcet, streaming-commons - , temporary, text, time, transformers, unix, vault, wai, wai-logger - , warp, word8, zlib - }: - mkDerivation { - pname = "wai-extra"; version = "3.1.15"; sha256 = "0n786h3ck3ik9s3p1wmfgy47j9hdzwkgjmcmjhjgyxrvsvnzn6mx"; isLibrary = true; @@ -324171,7 +324945,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Provides some basic WAI handlers and middleware"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -324274,8 +325047,8 @@ self: { ({ mkDerivation, base, bytestring, fcgi, wai, wai-extra }: mkDerivation { pname = "wai-handler-fastcgi"; - version = "3.0.0.2"; - sha256 = "1pvkykviql5qp8jvgy5d9abc8vkakmbw0bgmnsg53rna1zfvlmdm"; + version = "3.0.0.3"; + sha256 = "15z9zmlm8svak0gqcw4p0yx1q4dr7wqsn24a2zfzacihfi47pkva"; libraryHaskellDepends = [ base bytestring wai wai-extra ]; librarySystemDepends = [ fcgi ]; description = "Wai handler to fastcgi"; @@ -324318,6 +325091,8 @@ self: { pname = "wai-handler-launch"; version = "3.0.3.1"; sha256 = "1ifqgyc1ccig5angh5l1iq7vyms4lvi8wzvysg5dw82nml49n02m"; + revision = "1"; + editedCabalFile = "1jp1lngryrg4v84q4q6c5g7h93kasdk3bgp4x0miivvx8s8iibs6"; libraryHaskellDepends = [ async base bytestring http-types process streaming-commons transformers wai warp @@ -324362,6 +325137,8 @@ self: { pname = "wai-handler-webkit"; version = "3.0.0.3"; sha256 = "10sr9xgd95ncwczbmchaf2qjyadqchm566r3zhqc3bwgsydrsq08"; + revision = "1"; + editedCabalFile = "073p8nar10pv1p1k7ryjv38404wdmhzpv3llql034r6bhdplc5gr"; libraryHaskellDepends = [ base wai warp ]; libraryPkgconfigDepends = [ QtWebKit ]; description = "Turn WAI applications into standalone GUIs using QtWebkit"; @@ -326407,8 +327184,8 @@ self: { }: mkDerivation { pname = "waterfall-cad"; - version = "0.2.2.0"; - sha256 = "1il6s1mg9k9dhqcwj49a88p0z9zbwi65b2lvsg199rn6klv1jn36"; + version = "0.2.2.1"; + sha256 = "02kp3wdq3m9vdcxhjl20wb3rzjlb3qnci0qr9y1v9fkg2i290cxa"; libraryHaskellDepends = [ base filepath lattices lens linear opencascade-hs primitive resourcet @@ -326424,8 +327201,8 @@ self: { }: mkDerivation { pname = "waterfall-cad-examples"; - version = "0.2.2.0"; - sha256 = "0gy9iza13l03h381sm4riccjpn3zbpgy60d6fqhbj5rw1qisad2x"; + version = "0.2.2.1"; + sha256 = "120m6dxb451vh1j2rzyr8gp6az24b4da32d22cdszds9xabd65lq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -326464,6 +327241,8 @@ self: { pname = "wave"; version = "0.2.1"; sha256 = "1b8qm9jl453z9pklmqcz13f2abl69ab0j31151gz77l4dgxnnqzl"; + revision = "1"; + editedCabalFile = "1j6ycd1v6c5khkmybzss2vbfm93n28dh1ah8sipqqpd94yqwvdiz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ @@ -326856,8 +327635,8 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.15"; - sha256 = "1kmyhyc3c9b2k0678q8yhd52x51jz153i8180a16ig05w6clc4xx"; + version = "0.27.16"; + sha256 = "1643hr3fblf8m41961swkxch784max6xn49x0a0pnrxkv5y8brnq"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -326873,8 +327652,8 @@ self: { ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { pname = "web-routes-boomerang"; - version = "0.28.4.4"; - sha256 = "0sbw93flmhbwdg1lag5jm7qi8nh5fy4k3anxijzf1472y6kqncrp"; + version = "0.28.4.5"; + sha256 = "1jgpmm6s1n87p005ib9pjlc9b9xc3gn85ir6qhaak2s94l3nylrk"; libraryHaskellDepends = [ base boomerang mtl parsec text web-routes ]; @@ -326887,8 +327666,8 @@ self: { ({ mkDerivation, base, parsec, text, web-routes }: mkDerivation { pname = "web-routes-generics"; - version = "0.1.0.1"; - sha256 = "16nykkzjznl9zq2qgn87lpqxkz8yx83s7949lv4vzapp4hjv04yy"; + version = "0.1.0.2"; + sha256 = "1ld1kqs8qf6550p0n8vw5l676xj18sb78dzpgr74fcqjc6cbnc3v"; libraryHaskellDepends = [ base parsec text web-routes ]; description = "portable, type-safe URL routing"; license = lib.licenses.bsd3; @@ -326968,8 +327747,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.8.1"; - sha256 = "0sv8ya7s70zlfr9qhavpb9i0q3l5arcarsxgb20w6cbghfj67kh5"; + version = "0.22.8.2"; + sha256 = "11ps9cn5qz46w0i69znqb03fc6ljrwrn9y1cq0j1dsy7rjkqhgxm"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -327029,33 +327808,26 @@ self: { }) {}; "web-view" = callPackage - ({ mkDerivation, base, bytestring, casing, containers, effectful - , file-embed, http-types, string-interpolate, sydtest - , sydtest-discover, text, wai, warp + ({ mkDerivation, base, bytestring, casing, containers + , effectful-core, file-embed, http-types, string-interpolate + , sydtest, sydtest-discover, text }: mkDerivation { pname = "web-view"; - version = "0.3.1"; - sha256 = "1c27zmyx4n66gj1nlwnllk2c4vzmcb9xqjgadca12zql1vk69fv8"; - isLibrary = true; - isExecutable = true; + version = "0.4.0"; + sha256 = "1dy9qpscj1r6g35n11qyk7fd4nkhbxp0ism8cqhgm2gwmhc2yn56"; libraryHaskellDepends = [ - base bytestring casing containers effectful file-embed - string-interpolate text - ]; - executableHaskellDepends = [ - base bytestring casing containers effectful file-embed http-types - string-interpolate text wai warp + base bytestring casing containers effectful-core file-embed + http-types string-interpolate text ]; testHaskellDepends = [ - base bytestring casing containers effectful file-embed - string-interpolate sydtest text + base bytestring casing containers effectful-core file-embed + http-types string-interpolate sydtest text ]; testToolDepends = [ sydtest-discover ]; description = "Type-safe HTML and CSS with intuitive layouts and composable styles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - mainProgram = "example"; broken = true; }) {}; @@ -327662,8 +328434,8 @@ self: { }: mkDerivation { pname = "webgear-core"; - version = "1.2.0"; - sha256 = "03qp9x4f1hkv6swlrwp6kay104alapqqn5wvswykw6ji1wja0wj2"; + version = "1.3.0"; + sha256 = "1d16dvb76rjnpbapzp2m8g04wijyh6xzi8pcf03ymbll78x438w6"; libraryHaskellDepends = [ arrows base binary bytestring case-insensitive cookie http-api-data http-media http-types jose network tagged template-haskell text wai @@ -327675,15 +328447,16 @@ self: { "webgear-openapi" = callPackage ({ mkDerivation, arrows, base, http-media, http-types - , insert-ordered-containers, lens, openapi3, text, webgear-core + , insert-ordered-containers, lens, mtl, openapi3, text + , webgear-core }: mkDerivation { pname = "webgear-openapi"; - version = "1.2.0"; - sha256 = "0ym3jvkww6qf5nkrhb7wqp8maw6d03yc6835wp8wva8cj5cf9hy1"; + version = "1.3.0"; + sha256 = "1278dkhrckz9m8qjmqjfc2bxgnq4wsmrnyjkf24ci5lvxvrz3y9f"; libraryHaskellDepends = [ arrows base http-media http-types insert-ordered-containers lens - openapi3 text webgear-core + mtl openapi3 text webgear-core ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; @@ -327698,8 +328471,8 @@ self: { }: mkDerivation { pname = "webgear-server"; - version = "1.2.0"; - sha256 = "1pc46dcx3jndc1jaf1bbbhs1z20hvspkiq86y3b60i2vpcbdhwn0"; + version = "1.3.0"; + sha256 = "1s3iwzkb29g2zlkszarm27mlcwbszjwmmdzrb5ciqgz3l8pijyrx"; libraryHaskellDepends = [ aeson arrows base base64-bytestring binary bytestring cookie http-api-data http-media http-types jose monad-time mtl resourcet @@ -327716,15 +328489,16 @@ self: { "webgear-swagger" = callPackage ({ mkDerivation, arrows, base, http-types - , insert-ordered-containers, lens, swagger2, text, webgear-core + , insert-ordered-containers, lens, mtl, swagger2, text + , webgear-core }: mkDerivation { pname = "webgear-swagger"; - version = "1.2.0"; - sha256 = "1l1cgixhh8b7myypbr9anv6zbckh9x4h3a5lrwv7znh616n9440a"; + version = "1.3.0"; + sha256 = "1p10wn5jgfyqcysa14sx6lmirc4irl1nls5mblav50yr9a5ilipc"; libraryHaskellDepends = [ - arrows base http-types insert-ordered-containers lens swagger2 text - webgear-core + arrows base http-types insert-ordered-containers lens mtl swagger2 + text webgear-core ]; description = "Composable, type-safe library to build HTTP API servers"; license = lib.licenses.mpl20; @@ -327736,8 +328510,8 @@ self: { }: mkDerivation { pname = "webgear-swagger-ui"; - version = "1.2.0"; - sha256 = "1a40blmnwx1xia8r6dhk710mabxnqf31cqh0rhjzjlwsv96rsk9a"; + version = "1.3.0"; + sha256 = "1vz7ycl2kppiwqp23z2dg6binc3azb8p5r17hir00zr4i8jhl88m"; libraryHaskellDepends = [ base bytestring file-embed http-types text wai-app-static webgear-core @@ -328702,12 +329476,12 @@ self: { }) {}; "wherefrom-compat" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit }: + ({ mkDerivation, base, ghc-heap, tasty, tasty-hunit }: mkDerivation { pname = "wherefrom-compat"; - version = "0.1.1.0"; - sha256 = "14vzbm6skahqas3qflrw368d6llbq59fcxm31s9wj7fbmb239v3d"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "0sy2kyp0sz0vkirlxvyc1s5szhx1f6a8zn0sysl2vbgk0yis3b0d"; + libraryHaskellDepends = [ base ghc-heap ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A compatibility layer for GHC's 'wherefrom' function"; license = lib.licenses.bsd2; @@ -328851,6 +329625,8 @@ self: { pname = "wide-word"; version = "0.1.6.0"; sha256 = "15wp0mdjbaacvzwkjlmdr7w6bm239g5v3ylkczwr3cfj30da0snz"; + revision = "1"; + editedCabalFile = "10vrpakwm81fldr8d1yynd316db8811hv90mkkscky3a5j1qrka7"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable primitive ]; @@ -329299,25 +330075,6 @@ self: { }: mkDerivation { pname = "witch"; - version = "1.2.1.0"; - sha256 = "0kwg2qdjl3hfg3y7qi8lqsnrvfc80w1mkkwi4ikay8mzkp61snb3"; - libraryHaskellDepends = [ - base bytestring containers tagged template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit tagged text time transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "witch_1_2_1_1" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; version = "1.2.1.1"; sha256 = "0zllz1wg2jpldjnyjkswrshs3agr8bbqnb6agv4avfgvffpj0rw1"; libraryHaskellDepends = [ @@ -329328,7 +330085,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -330057,8 +330813,8 @@ self: { }: mkDerivation { pname = "word8set"; - version = "0.1.1"; - sha256 = "106sp0qqywfm43c4lriyvfaxzgn03z6m2krarysvp9ff0q3j2nhi"; + version = "0.1.2"; + sha256 = "0jbr571rxw0vxxc95568kdxrw9d0kk6np9wrwjd6rj6ybh532zr7"; libraryHaskellDepends = [ base deepseq lattices QuickCheck template-haskell wide-word ]; @@ -331282,21 +332038,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, crypton-connection, exceptions - , network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "2.0.1.8"; - sha256 = "1pdh44r11yxyjgyb8la28crsm7sk09fshmqcgxyxczwfjsa85dpk"; - libraryHaskellDepends = [ - base bytestring crypton-connection exceptions network websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = lib.licenses.mit; - }) {}; - - "wuss_2_0_1_9" = callPackage ({ mkDerivation, base, bytestring, crypton-connection, data-default , exceptions, network, websockets }: @@ -331310,7 +332051,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "wx" = callPackage @@ -331578,19 +332318,21 @@ self: { "x509-ocsp" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , cryptohash-sha1, crypton-x509, HUnit, pem + , cryptohash-sha1, crypton-x509, crypton-x509-validation, HUnit + , pem }: mkDerivation { pname = "x509-ocsp"; - version = "0.2.0.0"; - sha256 = "0vfk58yyk08w1752addpp4s2bn4d9395k7ajd5jal6wab400qgk6"; + version = "0.3.0.0"; + sha256 = "0ipp8xcb4q41mwxszprw2q12g24p9wi6j2z3p5zrw2kf6lfv72lp"; enableSeparateDataOutput = true; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring cryptohash-sha1 crypton-x509 ]; testHaskellDepends = [ - asn1-encoding asn1-types base bytestring crypton-x509 HUnit pem + asn1-encoding asn1-types base bytestring crypton-x509 + crypton-x509-validation HUnit pem ]; description = "Basic X509 OCSP implementation"; license = lib.licenses.bsd3; @@ -335015,8 +335757,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.8"; - sha256 = "0bsah360hxb1w9b1ypmgcdr1lb2wi4pzlbvgd106kqslkfyk942x"; + version = "0.14.9"; + sha256 = "19d53gl477ik0zb8fxq5irvjddgg7n2hjrg4j0x36pvsq3sy2zz9"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -339468,16 +340210,17 @@ self: { "zeugma" = callPackage ({ mkDerivation, base, chronos, hedgehog, incipit, polysemy - , polysemy-chronos, polysemy-test, tasty, tasty-expected-failure - , tasty-hedgehog + , polysemy-chronos, polysemy-process, polysemy-test, tasty + , tasty-expected-failure, tasty-hedgehog }: mkDerivation { pname = "zeugma"; - version = "0.9.0.1"; - sha256 = "1idiinilcxw97fff6yq59a4472y8qy7b28gx2nnzsi6ajq9azazk"; + version = "0.10.0.0"; + sha256 = "0q1q3hhj8lf10zbb34rx317h2pr6hp8807p2zsi4n7xdgi6qjz3s"; libraryHaskellDepends = [ base chronos hedgehog incipit polysemy polysemy-chronos - polysemy-test tasty tasty-expected-failure tasty-hedgehog + polysemy-process polysemy-test tasty tasty-expected-failure + tasty-hedgehog ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; @@ -339676,10 +340419,8 @@ self: { }: mkDerivation { pname = "zinza"; - version = "0.2"; - sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; - revision = "7"; - editedCabalFile = "192d8y4wh1xaylmfzwcjfck3hcyzbz5726zfp25rkc5jv5mp7p4s"; + version = "0.2.1"; + sha256 = "1k4k2yvijg0vwp3ykp9l77n3qdpivikqxx78ilvk6nx6w9sj58c8"; libraryHaskellDepends = [ base containers parsec text transformers ]; @@ -339738,6 +340479,38 @@ self: { description = "Operations on zip archives"; license = lib.licenses.bsd3; mainProgram = "haskell-zip-app"; + maintainers = [ lib.maintainers.mpscholten ]; + }) {}; + + "zip_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base, unix + }: + mkDerivation { + pname = "zip"; + version = "2.1.0"; + sha256 = "1rbrayns2q34b0cp9b6zl3k600lbgck1c214rmvmywkhmms07slm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base unix + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist filepath hspec + QuickCheck temporary text time + ]; + description = "Operations on zip archives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "haskell-zip-app"; + maintainers = [ lib.maintainers.mpscholten ]; }) {}; "zip-archive" = callPackage @@ -340307,8 +341080,8 @@ self: { }: mkDerivation { pname = "zoovisitor"; - version = "0.2.6.1"; - sha256 = "1lkmkv03k6icd85jbrv8rzwr1kl8v496m86kyc7sy773vlslkds1"; + version = "0.2.7.0"; + sha256 = "1lwkifawn33c005lwqrr0hyisvs5p37kl03j0vab8qhpz9wbnydk"; libraryHaskellDepends = [ base bytestring exceptions Z-Data ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ async base hspec uuid Z-Data ]; @@ -340323,8 +341096,8 @@ self: { pname = "zot"; version = "0.0.3"; sha256 = "0cibi8zm9v8vi4i2xdm4kpk1v2kc0sh0fc5ylsn78gwyjcdhkaf8"; - revision = "1"; - editedCabalFile = "04gsbs6fvwpjjg1f6g1j17dxlfzsci9vmirk7mwqwmm9ha0a4hxm"; + revision = "2"; + editedCabalFile = "1vfwh6rpr76wbjd8hwn575yycmz2bjj9pbjbh64lmfq116nfk63l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix index 33066d97ef64d..7bf0ea7c75404 100644 --- a/pkgs/development/interpreters/femtolisp/default.nix +++ b/pkgs/development/interpreters/femtolisp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "femtolisp"; - version = "0-unstable-2023-07-12"; + version = "0-unstable-2024-06-18"; src = fetchFromSourcehut { owner = "~ft"; repo = "femtolisp"; - rev = "b3a21a0ff408e559639f6c31e1a2ab970787567f"; - hash = "sha256-PE/xYhfhn0xv/kJWsS07fOF2n5sXP666vy7OVaNxc7Y="; + rev = "ee58f398fec62d3096b0e01da51a3969ed37a32d"; + hash = "sha256-pfPD9TNLmrqhvJS/aVVmziMVApsiU5v1nAMqU+Kduzw="; }; strictDeps = true; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 30f85baa364ec..8ed9bfe117366 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "4.0.21"; + version = "4.0.22"; src = fetchurl { url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip"; - sha256 = "sha256-Xvh49w24tkLSBOmkEMUZwRMaPnqd20tpENIUkJyy6Yo="; + sha256 = "sha256-2Ro93+NThx1MJlbT0KBcgovD/zbp1J29vsE9zZjwWHc="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index fb788377107e1..7eb0f1abc4cff 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -26,11 +26,11 @@ let in builder rec { pname = "guile"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0="; + sha256 = "sha256-vXFoUX/VJjM0RtT3q4FlJ5JWNAlPvTcyLhfiuNjnY4g="; }; outputs = [ "out" "dev" "info" ]; @@ -74,7 +74,6 @@ builder rec { patches = [ ./eai_system.patch - ./guile-hurd-posix-spawn.patch ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch ++ lib.optional stdenv.isDarwin (fetchpatch { diff --git a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch b/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch deleted file mode 100644 index 7cf600b4c2aa5..0000000000000 --- a/pkgs/development/interpreters/guile/guile-hurd-posix-spawn.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix <https://issues.guix.gnu.org/61095>, which affects GNU/Hurd. - -diff --git a/libguile/posix.c b/libguile/posix.c -index 3a8be94e4..f5fdc544c 100644 ---- a/libguile/posix.c -+++ b/libguile/posix.c -@@ -1326,7 +1326,14 @@ static void - close_inherited_fds_slow (posix_spawn_file_actions_t *actions, int max_fd) - { - while (--max_fd > 2) -- posix_spawn_file_actions_addclose (actions, max_fd); -+ { -+ /* Adding invalid file descriptors to an 'addclose' action leads -+ to 'posix_spawn' failures on some operating systems: -+ <https://bugs.gnu.org/61095>. Hence the extra check. */ -+ int flags = fcntl (max_fd, F_GETFD, NULL); -+ if ((flags >= 0) && ((flags & FD_CLOEXEC) == 0)) -+ posix_spawn_file_actions_addclose (actions, max_fd); -+ } - } - - static void - -Fix <https://issues.guix.gnu.org/62501>. - -diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test -index f20e04453..d5cf47cda 100644 ---- a/test-suite/tests/posix.test -+++ b/test-suite/tests/posix.test -@@ -431,7 +431,13 @@ - (let ((str (get-string-all (car input+output)))) - (close-port (car input+output)) - (waitpid pid) -- str))) -+ -+ ;; On GNU/Hurd, the exec server prepends 'LD_ORIGIN_PATH' for -+ ;; every program: <https://bugs.gnu.org/62501>. Strip it. -+ (if (and (string=? "GNU" (utsname:sysname (uname))) -+ (string-prefix? "LD_ORIGIN_PATH=" str)) -+ (string-drop str (+ 1 (string-index str #\newline))) -+ str)))) - - (pass-if-equal "ls /proc/self/fd" - "0\n1\n2\n3\n" ;fourth FD is for /proc/self/fd diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4c45d9603be82..d656760a71a1c 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -144,7 +144,7 @@ in , meta ? {} -, doCheck ? config.doCheckByDefault or false +, doCheck ? true , disabledTestPaths ? [] diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 1a6f9c784cf67..d0d8a9d0dca8f 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -92,7 +92,7 @@ , passthru ? {} -, doCheck ? config.doCheckByDefault or false +, doCheck ? true , disabledTestPaths ? [] diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index bb0b8bcdcae8a..8ea91a46dd57c 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; rev = version; - hash = "sha256-E4YwLds0eoh8PxcACntynQKeg8lRIsEy+JOiv8nF2t0="; + hash = "sha256-6XWfM7KJB+lMf/YFLaQ71DMa8owZtjjuMEyWY++CJnM="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index dbe678079f023..704d75b73bbc3 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-vU1fhR6pKz2qnznrJ/mknt9DVx+I1kLaPStXKQvp59g="; + hash = "sha256-y+xtJ4YbzPr1168tu+148Co7Ke/iC68aOQBwTINlp2Y="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 75d4964d15b9c..fafc53267dd8d 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2024.01"; + version = "2024.06"; src = fetchFromGitHub { owner = "raku"; repo = "nqp"; rev = version; - hash = "sha256-vcGj+PKCpCRLyjS158+U42BppJ0Yl53srZCde+fng0c="; + hash = "sha256-FqZPUtzlS+ZSlyuCFMWHofLXPuXCWAT6Oak0g3o8cgM="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 79cad7fe64478..b69658ff03c74 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { description = "Programming language for real time audio synthesis"; homepage = "https://supercollider.github.io"; changelog = "https://github.com/supercollider/supercollider/blob/Version-${version}/CHANGELOG.md"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix index 2881922aa1b22..492033c52c70d 100644 --- a/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix +++ b/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community plugins for SuperCollider"; homepage = "https://supercollider.github.io/sc3-plugins/"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/julia-modules/depot.nix b/pkgs/development/julia-modules/depot.nix index c2189ebaf94c0..017bc19acd503 100644 --- a/pkgs/development/julia-modules/depot.nix +++ b/pkgs/development/julia-modules/depot.nix @@ -56,6 +56,7 @@ runCommand "julia-depot" { # See https://github.com/NixOS/nixpkgs/issues/315890 git config --global --add safe.directory '*' + # Tell Julia to use the Git binary we provide, rather than internal libgit2. export JULIA_PKG_USE_CLI_GIT="true" # At time of writing, this appears to be the only way to turn precompiling's diff --git a/pkgs/development/julia-modules/python/minimal_registry.py b/pkgs/development/julia-modules/python/minimal_registry.py index c9527f0ef809c..eea40d1fb9510 100755 --- a/pkgs/development/julia-modules/python/minimal_registry.py +++ b/pkgs/development/julia-modules/python/minimal_registry.py @@ -75,7 +75,7 @@ for (uuid, versions) in uuid_to_versions.items(): os.makedirs(out_path / path) # Copy some files to the minimal repo unchanged - for f in ["Compat.toml", "Deps.toml"]: + for f in ["Compat.toml", "Deps.toml", "WeakCompat.toml", "WeakDeps.toml"]: if (registry_path / path / f).exists(): shutil.copy2(registry_path / path / f, out_path / path) diff --git a/pkgs/development/julia-modules/registry.nix b/pkgs/development/julia-modules/registry.nix index 71d0a2733e8c2..6daca3d17b421 100644 --- a/pkgs/development/julia-modules/registry.nix +++ b/pkgs/development/julia-modules/registry.nix @@ -3,7 +3,7 @@ fetchFromGitHub { owner = "CodeDownIO"; repo = "General"; - rev = "de80ad56e87f222ca6a7a517c69039d35437ab42"; - sha256 = "0pz1jmmcb2vn854w8w0zlpnihi470649cd8djh1wzgq2i2fy83bl"; - # date = "2023-12-22T03:28:12+00:00"; + rev = "998c6da1553dc0776dfff314d2f1bd5af488ed71"; + sha256 = "sha256-57RiIPTu9895mdk3oSfo7I3PYw7G0BfJG1u+mYkJeLk="; + # date = "2024-07-01T12:22:35+00:00"; } diff --git a/pkgs/development/libraries/agda/generics/default.nix b/pkgs/development/libraries/agda/generics/default.nix new file mode 100644 index 0000000000000..12815a3617bc6 --- /dev/null +++ b/pkgs/development/libraries/agda/generics/default.nix @@ -0,0 +1,28 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + pname = "generics"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "flupe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8="; + }; + + buildInputs = [ + standard-library + ]; + + # everythingFile = "./README.agda"; + + meta = with lib; { + description = + "Library for datatype-generic programming in Agda"; + homepage = src.meta.homepage; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/development/libraries/amf-headers/default.nix b/pkgs/development/libraries/amf-headers/default.nix index 07a76fcdfb127..04f2e6c1385b7 100644 --- a/pkgs/development/libraries/amf-headers/default.nix +++ b/pkgs/development/libraries/amf-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amf-headers"; - version = "1.4.33"; + version = "1.4.34"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; rev = "v${version}"; - sha256 = "sha256-oho1EonWxgBmsQiX3wPhs0jQjLFwLe49C7/SOEptYiw="; + sha256 = "sha256-AASoThCzyFharXrprUalOMufz/DDtzlc97q/dQk7B6Y="; }; installPhase = '' diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 8b11954429631..ce9a3d118973a 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -2,7 +2,7 @@ , lib , autoreconfHook , gitUpdater -, gnome +, gnome-common , which , fetchgit , libgtop @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { autoreconfHook dbus docbook_xsl - gnome.gnome-common + gnome-common gobject-introspection gtk-doc pkg-config diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 3879878e4779d..500b868edc07e 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.19.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-Nb/BF/+xDWV/6iPo3o/NO6EtIaAW+yGFj06AO2baFfc="; + hash = "sha256-woyl6HcUGOB3WWiNVMrmrpDAePFTzNtqK9V4UOzDb50="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index bc738ae976c99..93fcbf42c0507 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.9"; + version = "5.25.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-L0F9CkA/yWl7YfJtSBvSGSLTh2g7loIlpZMiC/ACU2k="; + sha256 = "sha256-ECTtKx/N5MfWwYSwOycs6FXxDR56DT9tkdRxrhX4fVU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index 2b98aca1d66d6..b26e630f1eae3 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; homepage = "https://github.com/graeme-hill/crossguid"; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e7915ad652144..cf120405a5fa6 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -57,23 +57,13 @@ ] ++ lib.optionals guiSupport [ libX11 ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - cuda_nvcc.dev - libcublas.dev - libcublas.lib - libcublas.static - libcurand.dev - libcurand.lib - libcurand.static - libcusolver.dev - libcusolver.lib - libcusolver.static - cudnn.dev - cudnn.lib - cudnn.static - cuda_cccl.dev + cuda_cudart + cuda_nvcc + libcublas + libcurand + libcusolver + cudnn + cuda_cccl ]); passthru = { diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 1597375cf7694..21c18dde6e336 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.35.0"; + version = "2.36.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-FoiPtmebHiQfULafMArFASSjGSNCri6pA9diG2ZOeeo="; + hash = "sha256-2nQUOmSyvuol6ifGOHW8jsKU5p5b0Ih4AgQOsEFR15o="; }; postPatch = '' diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 41775b0a9a538..aef6f10febe2d 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "24.06"; + version = "24.07"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-na2aTcxrS8vHTw80zCAefY8zEQ9EMD/iTQp9l4wkIrI="; + sha256 = "sha256-2J03W2jyQKD1QYRJoOZlIKElsZNqPMQ1AxAoFhWz1eU="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index dd498bb9aeac6..0e0e2108da8dd 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Deprecated API for integrating GdkPixbuf with Xlib data types"; homepage = "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"; - maintainers = teams.gnome.members; + maintainers = [ ]; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index c0934e7d18f9b..541fb7c14ebb4 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Simple OpenGL core profile loading"; homepage = "https://github.com/skaslev/gl3w"; license = licenses.unlicense; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 25d6c85aa328d..1fea5408ef2a4 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { - version = "3.2.14"; + version = "3.2.15"; pname = "gmime"; src = fetchurl { # https://github.com/jstedfast/gmime/releases url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; - sha256 = "sha256-pes91nX3LlRci8HNEhB+Sq0ursGQXre0ATzbH75eIxc="; + sha256 = "sha256-hM0qSBonlw7Dm1yV9y2wJnIpBKLM8/29V7KAzy0CtcQ="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 91639c441b481..b203eab089653 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -372,6 +372,6 @@ stdenv.mkDerivation rec { ''; license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index f48fe22f50001..930cdd79b7329 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -172,6 +172,6 @@ stdenv.mkDerivation (finalAttrs: { "gstreamer-video-1.0" ]; platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3136b6f886755..a6f0cee7d7dbb 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -123,6 +123,6 @@ stdenv.mkDerivation (finalAttrs: { "gstreamer-controller-1.0" ]; platforms = platforms.unix; - maintainers = with maintainers; [ ttuegel matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ ttuegel matthewbauer ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 44a79bb2c998d..41e3e1cba97d6 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 79ece373b57d0..cf15a4c406263 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index bd301e7b45c22..ac1a192f37ad1 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -215,6 +215,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 872627009e215..e3065437f5d84 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d4afb8ce7618a..4c0d8bffb35a7 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -258,6 +258,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"; license = with licenses; [ mpl20 asl20 mit lgpl21Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index db56d895f7876..b6d2b6464e41e 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ bkchr lilyinstarlight ]; + maintainers = with maintainers; [ bkchr ]; }; } diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 0b39bad01020b..6f8ac715af505 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { ''; license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer lilyinstarlight ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index cdad2eaf232d9..62f11a580c21d 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation rec { homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/hax11/default.nix b/pkgs/development/libraries/hax11/default.nix index fba0a560e9931..ea867bdf706e6 100644 --- a/pkgs/development/libraries/hax11/default.nix +++ b/pkgs/development/libraries/hax11/default.nix @@ -9,13 +9,13 @@ multiStdenv.mkDerivation (finalAttrs: { pname = "hax11"; - version = "0-unstable-2023-09-25"; + version = "0-unstable-2024-06-24"; src = fetchFromGitHub { owner = "CyberShadow"; repo = "hax11"; - rev = "2ea9d469785bbe0338729c4deeb902a259fd7b10"; - hash = "sha256-bYuIngZ76m5IgbbTFTZ8LJmpHl4nHS272Ci1B9eJIws="; + rev = "ef955862d7221d7714eafb33e28299eb758f4462"; + hash = "sha256-ND3N1oMUjmDkF7btcFucDxKxxANL9IKf08/6Kt6LX9o="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index c55f3ee186614..1e3d2e4923d98 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.12"; + version = "0.10.13"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-ITXkdCyUtuFhgHHmy3P4ZX6GgzyxVUYz4knCCPHGClc="; + hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U="; }; postPatch = '' diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 2cfce8ed20405..155fca30b00b8 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.20"; + version = "22.4.0"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-AqHzWm0ZWCJK0gMXxxBSHemKx3U1fOXCUGo/ORny2hI="; + sha256 = "sha256-8Tjc7rm38pgRE/8ZXRLOqazZHmj5jQJFooSe31Chpww="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 17dfd7385e124..5469266d0c12d 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,46 +1,92 @@ -{ lib, stdenv, fetchurl, unzip, jre, jre8 }: +{ lib +, stdenv +, fetchurl +, unzip +, jre +, jre8 +, genericUpdater +, writeShellScript +, common-updater-scripts +, gnused +}: let + inherit (lib.versions) major majorMinor splitVersion; + inherit (lib.strings) concatStringsSep versionAtLeast; + common = { pname, version, src, description, java ? jre - , prog ? null, jar ? null, license ? lib.licenses.mpl20 }: - stdenv.mkDerivation { - name = "${pname}-${version}"; + , prog ? null, jar ? null, license ? lib.licenses.mpl20 + , updateScript ? null }: + stdenv.mkDerivation (finalAttrs: let + mainProgram = if prog == null then pname else prog; + jar' = if jar == null then pname else jar; + in { inherit pname version src; nativeBuildInputs = [ unzip ]; - buildCommand = let - prog' = if prog == null then pname else prog; - jar' = if jar == null then pname else jar; - in '' + buildCommand = '' unzip $src -d $out mkdir -p $out/bin $out/share $out/share/java cp -s "$out"/*.jar "$out/share/java/" # */ rm -rf $out/notices mv $out/doc $out/share - cat > $out/bin/${prog'} <<EOF + cat > $out/bin/${mainProgram} <<EOF #! $shell export JAVA_HOME=${jre} exec ${jre}/bin/java -jar $out/${jar'}.jar "\$@" EOF - chmod a+x $out/bin/${prog'} + chmod a+x $out/bin/${mainProgram} ''; + passthru = lib.optionalAttrs (updateScript != null) { + inherit updateScript; + }; + meta = with lib; { - inherit description license; - homepage = "https://saxon.sourceforge.net/"; + inherit description license mainProgram; + homepage = if versionAtLeast finalAttrs.version "11" + then "https://www.saxonica.com/products/latest.xml" + else "https://www.saxonica.com/products/archive.xml"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; }; - }; + }); + + # Saxon release zipfiles and tags often use dashes instead of dots. + dashify = version: concatStringsSep "-" (splitVersion version); + + # SaxonJ-HE release files are pushed to the Saxon-HE GitHub repository. + # They are also available from Maven. + # + # Older releases were uploaded to SourceForge. They are also + # available from the Saxon-Archive GitHub repository. + github = { + updateScript = version: genericUpdater { + versionLister = writeShellScript "saxon-he-versionLister" '' + export PATH="${lib.makeBinPath [ common-updater-scripts gnused ]}:$PATH" + major_ver="${major version}" + list-git-tags --url="https://github.com/Saxonica/Saxon-HE.git" \ + | sed -En \ + -e "s/SaxonHE([0-9]+)-([0-9]+)/\1.\2/" \ + -e "/^''${major_ver:-[0-9]+}\./p" + ''; + }; + + downloadUrl = version: let + tag = "SaxonHE${dashify version}"; + filename = "${major version}/Java/${tag}J.zip"; + in + "https://raw.githubusercontent.com/Saxonica/Saxon-HE/${tag}/${filename}"; + }; in { - saxon = common { + saxon = common rec { pname = "saxon"; version = "6.5.3"; src = fetchurl { - url = "mirror://sourceforge/saxon/saxon6_5_3.zip"; + url = "mirror://sourceforge/saxon/saxon${dashify version}.zip"; sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; description = "XSLT 1.0 processor"; @@ -49,50 +95,63 @@ in { java = jre8; }; - saxonb_8_8 = common { + saxonb_8_8 = common rec { pname = "saxonb"; version = "8.8"; jar = "saxon8"; src = fetchurl { - url = "mirror://sourceforge/saxon/saxonb8-8j.zip"; + url = "mirror://sourceforge/saxon/saxonb${dashify version}j.zip"; sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8"; }; description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; java = jre8; }; - saxonb_9_1 = common { + saxonb_9_1 = common rec { pname = "saxonb"; version = "9.1.0.8"; jar = "saxon9"; src = fetchurl { - url = "mirror://sourceforge/saxon/Saxon-B/9.1.0.8/saxonb9-1-0-8j.zip"; + url = "mirror://sourceforge/saxon/Saxon-B/${version}/saxonb${dashify version}j.zip"; sha256 = "1d39jdnwr3v3pzswm81zry6yikqlqy9dp2l2wmpqdiw00r5drg4j"; }; description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; }; - saxon_9-he = common { + # Saxon-HE (home edition) replaces Saxon-B as the open source + # version of the Saxon XSLT and XQuery processor. + saxon_9-he = common rec { pname = "saxon-he"; version = "9.9.0.1"; - prog = "saxon-he"; jar = "saxon9he"; src = fetchurl { - url = "mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip"; + url = "mirror://sourceforge/saxon/Saxon-HE/${majorMinor version}/SaxonHE${dashify version}J.zip"; sha256 = "1inxd7ia7rl9fxfrw8dy9sb7rqv76ipblaki5262688wf2dscs60"; }; description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; }; - saxon-he = common { + saxon_11-he = common rec { pname = "saxon-he"; - version = "11.5"; - prog = "saxon-he"; - jar = "saxon-he-11.5"; + version = "11.6"; + jar = "saxon-he-${version}"; src = fetchurl { - url = "https://github.com/Saxonica/Saxon-HE/raw/a6d11dec3853326b661e9aff283e30b43c02e163/11/Java/SaxonHE11-5J.zip"; - sha256 = "2Nwh6dG3YAjc/OTr8DMOfbnRvdCWB0YsVP3ZLRbM9U0="; + url = github.downloadUrl version; + sha256 = "/AVX5mtZSO6Is19t3+FlEvtIBsnwB3MIWAPCht8Aqnw="; }; + updateScript = github.updateScript version; description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; }; + + saxon_12-he = common rec { + pname = "saxon-he"; + version = "12.4"; + jar = "saxon-he-${version}"; + src = fetchurl { + url = github.downloadUrl version; + hash = "sha256-RKso6pRQkJgxlvC2R5WWon/VejQehGW223/C7KjD3c4="; + }; + updateScript = github.updateScript version; + description = "Processor for XSLT 3.0, XPath 3.1, and XQuery 3.1"; + }; } diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 2d3f4eeb65755..ef7994fea2185 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -11,7 +11,6 @@ , libGLU , libXt , libXtst -, gnome2 }: let @@ -68,9 +67,6 @@ in stdenv.mkDerivation rec { libGL libGLU libXtst - gnome2.gnome_vfs - gnome2.libgnome - gnome2.libgnomeui ] ++ lib.optionals (lib.hasPrefix "8u" jdk.version) [ libXt ]; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 2efbf85d47c72..38b1dafa00663 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome-common , gtk-doc, gtk2, lua, gobject-introspection }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake gobject-introspection ]; buildInputs = [ - libtool gnome.gnome-common gtk-doc gtk2 + libtool gnome-common gtk-doc gtk2 lua ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index e7bbd2b131d53..3ee266ee3a18a 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome-common , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { automake libtool pkg-config - gnome.gnome-common + gnome-common gtk-doc gobject-introspection ]; diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix index bff25956f7a95..dc73e71111c47 100644 --- a/pkgs/development/libraries/kronosnet/default.nix +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.28"; + version = "1.29"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-HxdZy2TiQT7pWyhaSq4YJAcqjykzWy1aI3gEZrlbghQ="; + sha256 = "sha256-GRjoNNF9jW2uNQAJjOM9TQtq9rS+12s94LhCXQr5aoQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 449176cfd9e5e..cfb86575f52d8 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -13,6 +13,7 @@ , glib , gtk4 , gnome +, adwaita-icon-theme , gsettings-desktop-schemas , desktop-file-utils , xvfb-run @@ -23,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.5.1"; + version = "1.5.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -33,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; rev = finalAttrs.version; - hash = "sha256-dH0VPIt6SGTDcb1I72cKnNlyqZ3dptvKmMDjOd17BfA="; + hash = "sha256-0Zu6knxP6GiqJMtwd8uRN72Lf7JfwB6JWjS1ggeANPM="; }; depsBuildBuild = [ @@ -70,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run ]; diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix index cc6a340355bab..94c414a08356c 100644 --- a/pkgs/development/libraries/libdatachannel/default.nix +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libdatachannel"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "paullouisageneau"; repo = "libdatachannel"; rev = "v${version}"; - hash = "sha256-sTdA4kCIdY3l/YUNKbXzRDS1O0AFx90k94W3cJpfLIY="; + hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index c9a1d09172a98..11cc35b2e5098 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , autoreconfHook +, gnome-common , pkg-config , intltool , gtk-doc @@ -32,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook - gnome.gnome-common + gnome-common pkg-config intltool gtk-doc diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix deleted file mode 100644 index f31f26539a55d..0000000000000 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool -, testers -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libgnome-keyring"; - version = "2.32.0"; - - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; - }; - - outputs = [ "out" "dev" ]; - - strictDeps = true; - propagatedBuildInputs = [ glib dbus libgcrypt ]; - nativeBuildInputs = [ pkg-config intltool ]; - - configureFlags = [ - # not ideal to use -config scripts but it's not possible switch it to pkg-config - # binaries in dev have a for build shebang - "LIBGCRYPT_CONFIG=${lib.getExe' (lib.getDev libgcrypt) "libgcrypt-config"}" - ]; - - postPatch = '' - # uses pkg-config in some places and uses the correct $PKG_CONFIG in some - # it's an ancient library so it has very old configure scripts and m4 - substituteInPlace ./configure \ - --replace "pkg-config" "$PKG_CONFIG" - ''; - - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - - meta = { - pkgConfigModules = [ "gnome-keyring-1" ]; - inherit (glib.meta) platforms maintainers; - homepage = "https://gitlab.gnome.org/Archive/libgnome-keyring"; - license = with lib.licenses; [ gpl2 lgpl2 ]; - }; -}) diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/development/libraries/libkrun/default.nix index 9549edc2caebf..de0e20d93ff2c 100644 --- a/pkgs/development/libraries/libkrun/default.nix +++ b/pkgs/development/libraries/libkrun/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "containers"; repo = "libkrun"; rev = "refs/tags/v${version}"; - hash = "sha256-R8JofaoqEM6IL4mr10kOWH0GfqwuyG2qkFjGR1+0fXw="; + hash = "sha256-LIp2/794gbHPweBJcHCjbF0m+bJAs0SPF7WivW7fxLI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-gPWTFl5YrlWDBXyksc9TidOzQf42bSJ05pdqtErk844="; + hash = "sha256-g4ceYi16mjEgvWTAQEW8ShT/e5IKnlgLgk49Mg0N2fQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index a5a1983e615e0..fb4207060033f 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-oXvx+tErGrF/X2x3ZiifuHIA6RlFMjTD7BZk13NL6Pg="; + hash = "sha256-VAs9O00g7Pn5AL9Vu6hwcY5QZy9U+izbEkrfOFeWzos="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libopenshot-audio/default.nix b/pkgs/development/libraries/libopenshot-audio/default.nix index 005422295236e..236b3026068ff 100644 --- a/pkgs/development/libraries/libopenshot-audio/default.nix +++ b/pkgs/development/libraries/libopenshot-audio/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libopenshot-audio"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${finalAttrs.version}"; - hash = "sha256-PLpB9sy9xehipN5S9okCHm1mPm5MaZMVaFqCBvFUiTw="; + hash = "sha256-9iHeVMoyzTQae/PVYJqON0qOPo3SJlhrqbcp2u1Y8MA="; }; patches = [ diff --git a/pkgs/development/libraries/libopenshot/default.nix b/pkgs/development/libraries/libopenshot/default.nix index 4622dabb2983a..0d83fa659e53d 100644 --- a/pkgs/development/libraries/libopenshot/default.nix +++ b/pkgs/development/libraries/libopenshot/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libopenshot"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${finalAttrs.version}"; - hash = "sha256-axFGNq+Kg8atlaSlG8EKvxj/FwLfpDR8/e4otmnyosM="; + hash = "sha256-9X2UIRDD+1kNLbV8AnnPabdO2M0OfTDxQ7xyZtsE10k="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index ceda871932abc..3a46a88f880b1 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "8.13.37"; + version = "8.13.39"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-TQ9Hz9fnKZhZkg+hkXgFqH4TDCWMe+fcEWE6ShwSBBU="; + hash = "sha256-NfKdOTb/P7RXyvSiTZ/15alw9sBjqoGSOys/kcIXGWg="; }; patches = [ diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 9ce3241e8fbb4..a8a8c3e77e08b 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-avUbgXPPV3IhUwZyARxCvctbVlLqDKWmMhAjdVBA3jY="; + sha256 = "sha256-t2LpOPx+S2iABQv3+xFdHj/FjWns40cNKToDKMZhAuw="; }; separateDebugInfo = true; diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/development/libraries/libthai/default.nix index a88b427e3349a..0406c3dbafb1a 100644 --- a/pkgs/development/libraries/libthai/default.nix +++ b/pkgs/development/libraries/libthai/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Set of Thai language support routines"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; pkgConfigModules = [ "libthai" ]; }; } diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 097f19a29366f..67d1f22dcae9f 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -163,6 +163,7 @@ stdenv.mkDerivation rec { sed -i '/qemuhotplugtest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build + sed -i '/domaincapstest/d' tests/meson.build ''; strictDeps = true; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 43f9065dfa615..cb7038d5355ce 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; homepage = "https://gitlab.gnome.org/Archive/libzapojit"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 9ab45a77ff3b9..73e93398626ce 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.27.3"; + version = "1.27.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-j/Z1fwP7Lt1izRmSxAqnWDX7ehD7QQWXERUIdyPpwMU="; + hash = "sha256-67bAiu40VQDtTJPlg6wOxQs4nyLZQ8aJJ5WJ1J9NNlw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index baae6b953f9be..708babff635d8 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.2.5"; + version = "5.2.6"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-QGHmet7Tbuyue48hjtqdl6F2PzQLuWAVwW4xvPEI3NU="; + hash = "sha256-v4kK1+tn/pgY2vz5BYzCBKfvLe5hti0ofUChUvQ++JU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 3f45d2e39c79a..63a7d2c879edb 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.101"; - hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts="; + version = "3.101.1"; + hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4="; } diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index e188e8a0e01df..8df7bd6059928 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nsync"; - version = "1.28.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - hash = "sha256-PAUgT1SoMiPMA4MH8zHxBtTFdg8Jn6H+w0HA64i2vPk="; + hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a4961163c9ad3..e2509ca5199a1 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -372,28 +372,19 @@ effectiveStdenv.mkDerivation { doxygen graphviz-nox ] ++ lib.optionals enableCuda (with cudaPackages; [ - cuda_cudart.lib - cuda_cudart.dev - cuda_cccl.dev # <thrust/*> - libnpp.dev # npp.h - libnpp.lib - libnpp.static + cuda_cudart + cuda_cccl # <thrust/*> + libnpp # npp.h nvidia-optical-flow-sdk ] ++ lib.optionals enableCublas [ # May start using the default $out instead once # https://github.com/NixOS/nixpkgs/issues/271792 # has been addressed - libcublas.static - libcublas.lib - libcublas.dev # cublas_v2.h + libcublas # cublas_v2.h ] ++ lib.optionals enableCudnn [ - cudnn.dev # cudnn.h - cudnn.lib - cudnn.static + cudnn # cudnn.h ] ++ lib.optionals enableCufft [ - libcufft.dev # cufft.h - libcufft.lib - libcufft.static + libcufft # cufft.h ]); propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 8c54c13c9139e..59f2d21d4c482 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda - ++ lib.optionals cudaSupport [ "--with-cuda=${cudaPackages.cuda_cudart}" "--enable-dlopen" ] + ++ lib.optionals cudaSupport [ "--with-cuda=${lib.getDev cudaPackages.cuda_cudart}" "--enable-dlopen" ] ++ lib.optionals fabricSupport [ "--with-psm2=${lib.getDev libpsm2}" "--with-libfabric=${lib.getDev libfabric}" ] ; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 361756f94ea90..981ab14ddcaaf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -143,6 +143,15 @@ let # trying to build binaries statically. ++ lib.optional static "no-ct" ++ lib.optional withZlib "zlib" + # /dev/crypto support has been dropped in OpenBSD 5.7. + # + # OpenBSD's ports does this too, + # https://github.com/openbsd/ports/blob/a1147500c76970fea22947648fb92a093a529d7c/security/openssl/3.3/Makefile#L25. + # + # https://github.com/openssl/openssl/pull/10565 indicated the + # intent was that this would be configured properly automatically, + # but that doesn't appear to be the case. + ++ lib.optional stdenv.hostPlatform.isOpenBSD "no-devcryptoeng" ++ lib.optionals (stdenv.hostPlatform.isMips && stdenv.hostPlatform ? gcc.arch) [ # This is necessary in order to avoid openssl adding -march # flags which ultimately conflict with those added by diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index f153d7f2f18b6..710d985ee346e 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.1.37"; + version = "1.1.38"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-J9IfhTFFSY+rK0DqFdXtINo7nlGUcy2Lljq81T417qc="; + sha256 = "sha256-nM/c6fvjprQ5GQO4F13cOigi4xATgRTq+ebEwyv58gg="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 9fa4bf10f47fc..1a13f6d48bb3e 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, gnome, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkg-config gobject-introspection ]; + nativeBuildInputs = [ pkg-config gobject-introspection gnome-common ]; buildInputs = [ cairo glib - gnome.gnome-common gtk3 gnome.libsoup + gtk3 gnome.libsoup ]; meta = with lib; { diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index 53a3d080f5413..3eef51bbbd8a9 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6.5"; + version = "4.6.6"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-0k753wogNW8oW//mlVWxGLt8VIO+29f0C4CJ+rGprvw="; + hash = "sha256-JPL5+GoL4zvHgStgTV9pJBPsQtAeE2DJe02YrZEtdJ8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/development/libraries/platform-folders/default.nix index 242bbe7770e48..3a9780a960eb2 100644 --- a/pkgs/development/libraries/platform-folders/default.nix +++ b/pkgs/development/libraries/platform-folders/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "C++ library to look for standard platform directories so that you do not need to write platform-specific code"; homepage = "https://github.com/sago007/PlatformFolders"; license = licenses.mit; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 17ab3f100b81a..8eeb31e96c483 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitLab +, fetchpatch , cairo , cmake , boost @@ -55,6 +56,15 @@ stdenv.mkDerivation (finalAttrs: rec { hash = "sha256-GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4="; }; + patches = [ + (fetchpatch { + # https://access.redhat.com/security/cve/CVE-2024-6239 + name = "CVE-2024-6239.patch"; + url = "https://gitlab.freedesktop.org/poppler/poppler/-/commit/0554731052d1a97745cb179ab0d45620589dd9c4.patch"; + hash = "sha256-I78wJ4l1DSh+x/e00ZL8uvrGdBH+ufp+EDm0A1XWyCU="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index b1308159eb688..dabb77ea0c85d 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -174,6 +174,12 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qtsystems = [ + # Fix crash if no X11 display available + (fetchpatch { + url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/1a4df40671d6f1bb0657a9dfdae4cd9bd48fcf21/debian/patches/1005_check_XOpenDisplay.patch"; + hash = "sha256-/onla2nlUSySEgz2IYOYajx/LZkJzAKDyxwAZzy0Ivs="; + }) + # Enable building with udisks support (fetchpatch { url = "https://salsa.debian.org/qt-kde-team/qt/qtsystems/-/raw/a23fd92222c33479d7f3b59e48116def6b46894c/debian/patches/2001_build_with_udisk.patch"; diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 4cf38eda39ca6..e90f7f8f4b5aa 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.557"; + version = "1.5.53"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-RcEkmPMcfNGDmu2bQwUHvlHgM/ySQQwDgf/NpTQMxcI="; + sha256 = "sha256-6/gq1yD4almO+CUY5xVnhWCjmu3teiJEGE7ONE1Zk8A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 0a2967d0fcb1f..ad5a525456c9b 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-urMdK+6ORHRgisppb700jaQpxLXAvXVjd8WDN7Zky3A="; + hash = "sha256-8s2Jd1fI8iNmFyMbCEaGZdpqvYFB1tVNZ41ICLN4AeI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix index a51b675bd9185..2af9968c842c4 100644 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ b/pkgs/development/libraries/rapidyaml/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Library to parse and emit YAML, and do it fast"; homepage = "https://github.com/biojppm/rapidyaml"; license = licenses.mit; - maintainers = with maintainers; [ martfont ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 5af73735fdf60..1dfe814427889 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -33,19 +33,15 @@ let stdenv = if cudaSupport then backendStdenv else inputs.stdenv; - cudaJoined = symlinkJoin { - name = "cuda-packages-unsplit"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - libcublas - libcurand - cuda_cccl - ] ++ lib.optionals (cudaPackages ? cuda_profiler_api) [ - cuda_profiler_api # cuda_profiler_api.h - ] ++ lib.optionals (!(cudaPackages ? cuda_profiler_api)) [ - cuda_nvprof # cuda_profiler_api.h - ]; - }; + cudaComponents = with cudaPackages; [ + cuda_cudart # cuda_runtime.h + libcublas + libcurand + cuda_cccl + + # cuda_profiler_api.h + (cudaPackages.cuda_profiler_api or cudaPackages.cuda_nvprof) + ]; in stdenv.mkDerivation { inherit pname version; @@ -68,9 +64,7 @@ stdenv.mkDerivation { pythonPackages.wheel ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp - ] ++ lib.optionals cudaSupport [ - cudaJoined - ]; + ] ++ lib.optionals cudaSupport cudaComponents; propagatedBuildInputs = lib.optionals pythonSupport [ pythonPackages.numpy @@ -93,7 +87,6 @@ stdenv.mkDerivation { "-DFAISS_OPT_LEVEL=${optLevel}" ] ++ lib.optionals cudaSupport [ "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}" - "-DCUDAToolkit_INCLUDE_DIR=${cudaJoined}/include" ]; buildFlags = [ diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index a675142f361d4..08dac598f7d91 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -134,19 +134,15 @@ stdenv.mkDerivation { blas python3 ] ++ lists.optionals cudaSupport (with effectiveCudaPackages; [ - cuda_cudart.dev # cuda_runtime.h - cuda_cudart.lib # cudart - cuda_cudart.static # cudart_static - libcublas.dev # cublas_v2.h - libcublas.lib # cublas - libcusparse.dev # cusparse.h - libcusparse.lib # cusparse + cuda_cudart # cuda_runtime.h + libcublas # cublas_v2.h + libcusparse # cusparse.h ] ++ lists.optionals (cudaOlder "11.8") [ - cuda_nvprof.dev # <cuda_profiler_api.h> + cuda_nvprof # <cuda_profiler_api.h> ] ++ lists.optionals (cudaAtLeast "11.8") [ - cuda_profiler_api.dev # <cuda_profiler_api.h> + cuda_profiler_api # <cuda_profiler_api.h> ] ++ lists.optionals (cudaAtLeast "12.0") [ - cuda_cccl.dev # <nv/target> + cuda_cccl # <nv/target> ]) ++ lists.optionals rocmSupport [ rocmPackages.clr rocmPackages.hipblas diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix deleted file mode 100644 index c07250c660a33..0000000000000 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, stdenv -, fetchurl -, darwin -, gfortran -, python3 -, blas -, lapack -, mpiSupport ? true -, mpi # generic mpi dependency -, openssh # required for openmpi tests -, petsc-withp4est ? false -, p4est -, zlib # propagated by p4est but required by petsc -, petsc-optimized ? false -, petsc-scalar-type ? "real" -, petsc-precision ? "double" -}: - -# This version of PETSc does not support a non-MPI p4est build -assert petsc-withp4est -> p4est.mpiSupport; - -stdenv.mkDerivation rec { - pname = "petsc"; - version = "3.19.4"; - - src = fetchurl { - url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY="; - }; - - inherit mpiSupport; - withp4est = petsc-withp4est; - - strictDeps = true; - nativeBuildInputs = [ python3 gfortran ] - ++ lib.optional mpiSupport mpi - ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh - ; - buildInputs = [ blas lapack ] - ++ lib.optional withp4est p4est - ; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace config/install.py \ - --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool - ''; - - # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr): - # [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery. - # [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory - # These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages. - patches = [ ./filter_mpi_warnings.patch ]; - - preConfigure = '' - patchShebangs ./lib/petsc/bin - configureFlagsArray=( - $configureFlagsArray - ${if !mpiSupport then '' - "--with-mpi=0" - '' else '' - "--CC=mpicc" - "--with-cxx=mpicxx" - "--with-fc=mpif90" - "--with-mpi=1" - ''} - ${lib.optionalString withp4est '' - "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=-L${zlib}/lib -lz" - ''} - "--with-blas=1" - "--with-lapack=1" - "--with-scalar-type=${petsc-scalar-type}" - "--with-precision=${petsc-precision}" - ${lib.optionalString petsc-optimized '' - "--with-debugging=0" - COPTFLAGS='-g -O3' - FOPTFLAGS='-g -O3' - CXXOPTFLAGS='-g -O3' - ''} - ) - ''; - - configureScript = "python ./configure"; - - enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - - meta = with lib; { - description = "Portable Extensible Toolkit for Scientific computation"; - homepage = "https://www.mcs.anl.gov/petsc/index.html"; - license = licenses.bsd2; - maintainers = with maintainers; [ cburstedde ]; - }; -} diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index fcfd9b56a1b14..43623e8604b9b 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -36,17 +36,15 @@ stdenv.mkDerivation rec { buildInputs = assert (blas.isILP64 == lapack.isILP64); [ blas lapack metis - gfortran.cc.lib + (lib.getLib gfortran.cc) gmp mpfr ] ++ lib.optionals stdenv.cc.isClang [ openmp ] ++ lib.optionals enableCuda [ - cudaPackages.cuda_cudart.dev - cudaPackages.cuda_cudart.lib - cudaPackages.cuda_cccl.dev - cudaPackages.libcublas.dev - cudaPackages.libcublas.lib + cudaPackages.cuda_cudart + cudaPackages.cuda_cccl + cudaPackages.libcublas ]; preConfigure = '' @@ -63,8 +61,8 @@ stdenv.mkDerivation rec { "CFLAGS=-DBLAS64" ] ++ lib.optionals enableCuda [ "CUDA_PATH=${cudaPackages.cuda_nvcc}" - "CUDART_LIB=${cudaPackages.cuda_cudart.lib}/lib/libcudart.so" - "CUBLAS_LIB=${cudaPackages.libcublas.lib}/lib/libcublas.so" + "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so" + "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.13.0/SuiteSparse_config/SuiteSparse_config.mk#L368 diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix index e9367d416e325..e20365b215dcc 100644 --- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix +++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix @@ -14,15 +14,15 @@ inherit (cudaPackages) backendStdenv flags; cuda-common-redist = with cudaPackages; [ - cuda_cudart.dev # cuda_runtime.h - cuda_cudart.lib - cuda_cccl.dev # <nv/target> - libcublas.dev # cublas_v2.h - libcublas.lib - libcusolver.dev # cusolverDn.h - libcusolver.lib - libcusparse.dev # cusparse.h - libcusparse.lib + (lib.getDev cuda_cudart) # cuda_runtime.h + (lib.getLib cuda_cudart) + (lib.getDev cuda_cccl) # <nv/target> + (lib.getDev libcublas) # cublas_v2.h + (lib.getLib libcublas) + (lib.getDev libcusolver) # cusolverDn.h + (lib.getLib libcusolver) + (lib.getDev libcusparse) # cusparse.h + (lib.getLib libcusparse) ]; cuda-native-redist = symlinkJoin { diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index d73c521997a08..475a92e79c3e1 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "socket_wrapper"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; - sha256 = "sha256-CgjsJJ3Z/7s7FtV3s1LVc1YfV77uw1lhgqxuyORrmrY="; + sha256 = "sha256-CWz7TqucebUtss51JsVeUI8GZb/qxsS8ZqPIMh2HU1g="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index d53d15a3f71a6..6a6752c3eb93e 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.7.0"; + version = "7.1.1"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-XxE6FWSp0tmP+VJJ9IcaTIFaBdu5uIZqgrE6sVjDets="; + hash = "sha256-6n1u37UkSN39wexI+JpyH+bAolnBD471b2D83th6lLs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix index c0f6f3fd42b4d..0a2637d90648e 100644 --- a/pkgs/development/libraries/tagparser/default.nix +++ b/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.1.0"; + version = "12.2.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-83Xxj1CQsghbAsQ/3GKIYCz9lBNEBvLlx1iOKbszn8A="; + hash = "sha256-Plq6iimXStrveSw+SfzuXUuLlQ06ugO21e97fXivqYk="; }; nativeBuildInputs = [ cmake ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags"; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index 3c31d152fc705..cdb5303f1a113 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-Iy9BhkyJa2nFxwVXb4LAlgVAHnu+58Ago2eEgAIlZ7M="; + hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; }; patches = [ diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 464ea6e374c37..8f134cd594e3c 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { LDFLAGS = lib.optionals enableCuda [ # Fake libnvidia-ml.so (the real one is deployed impurely) - "-L${cudaPackages.cuda_nvml_dev}/lib/stubs" + "-L${lib.getLib cudaPackages.cuda_nvml_dev}/lib/stubs" ]; configureFlags = [ diff --git a/pkgs/development/libraries/wapp/default.nix b/pkgs/development/libraries/wapp/default.nix index fd98f419da9af..9543b49af3b9a 100644 --- a/pkgs/development/libraries/wapp/default.nix +++ b/pkgs/development/libraries/wapp/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation { pname = "wapp"; - version = "unstable-2023-05-05"; + version = "0-unstable-2024-05-23"; src = fetchurl { - url = "https://wapp.tcl-lang.org/home/raw/72d0d081e3e6a4aea91ddf429a85cbdf40f9a32d46cccfe81bb75ee50e6cf9cf?at=wapp.tcldir?ci=9d3368116c59ef16"; - hash = "sha256-poG7dvaiOXMi4oWMQ5t3v7SYEqZLUY/TsWXrTL62xd0="; + url = "https://wapp.tcl-lang.org/home/raw/98f23b2160bafc41f34be8e5d8ec414c53d33412eb2f724a07f2476eaf04ac6f?at=wapp.tcl"; + hash = "sha256-A+Ml5h5C+OMoDQtAoB9lHgYEK1A7qHExT3p46PHRTYg="; }; dontUnpack = true; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 0e9011778d2de..687a51832f96a 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -21,7 +21,7 @@ , seatd , vulkan-loader , glslang -, libliftoff_0_4 +, libliftoff , libdisplay-info , nixosTests @@ -132,7 +132,7 @@ rec { ]; extraBuildInputs = [ ffmpeg - libliftoff_0_4 + libliftoff libdisplay-info ]; }; diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index fdcad63a279f6..a118c51ff136f 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; maintainers = with maintainers; [ greg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 143d82b53b597..87103e5ff3f51 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -430,7 +430,7 @@ let pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3 # needed for XDG_ICON_DIRS - pkgs.gnome.adwaita-icon-theme + pkgs.adwaita-icon-theme ]; # This patch removes the :build-operation component from the nyxt/gi-gtk-application system. diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 168cb66f8c9bc..efa9a1e423cd7 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -43,4 +43,5 @@ mapAliases { cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 nlua-nvim = throw "nlua-nvim was removed, use neodev-nvim instead"; # added 2023-12-16 nvim-client = throw "nvim-client was removed because it is now part of neovim"; # added 2023-12-17 + toml = throw "toml was removed because broken. You can use toml-edit instead"; # added 2024-06-25 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d159c09a64803..61fab76b98345 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -11,7 +11,7 @@ buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/alt-getopt-0.8.0-1.rockspec"; + url = "mirror://luarocks/alt-getopt-0.8.0-1.rockspec"; sha256 = "17yxi1lsrbkmwzcn1x48x8758d7v1frsz1bmnpqfv4vfnlh0x210"; }).outPath; src = fetchFromGitHub { @@ -49,6 +49,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/kikito/ansicolors.lua"; description = "Library for color Manipulation."; + maintainers = with lib.maintainers; [ Freed-Wu ]; license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }) {}; @@ -58,7 +59,7 @@ buildLuarocksPackage { pname = "argparse"; version = "0.7.1-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.7.1-1.rockspec"; + url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; }).outPath; src = fetchzip { @@ -225,14 +226,14 @@ buildLuarocksPackage { commons-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "commons.nvim"; - version = "15.0.2-1"; + version = "18.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/commons.nvim-15.0.2-1.rockspec"; - sha256 = "1n78bgp9y2smnhkjkdvn2c6lq6071k9dml4j6r7hk462hxsbjsqn"; + url = "mirror://luarocks/commons.nvim-18.0.0-1.rockspec"; + sha256 = "073cmh0a1kqzw71ckir8rk6nrhi14rc96vmxzhl4zbfyr3ji05r7"; }).outPath; src = fetchzip { - url = "https://github.com/linrongbin16/commons.nvim/archive/cc17fd28c5f171c5d55f75d668b812e2d70b4cf3.zip"; - sha256 = "0w5z03r59jy3zb653dwp9c6fq8ivjj1j2ksnsx95wlmj1mx04ixi"; + url = "https://github.com/linrongbin16/commons.nvim/archive/75407685b543cdb2263e92366bc4f3c828f4ad69.zip"; + sha256 = "0zm0kjch5rzdkv6faksw16lmhxkil2sdhfl7xvdyc0z830d1k2km"; }; disabled = luaOlder "5.1"; @@ -349,8 +350,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "teal-language"; repo = "cyan"; - rev = "51649e4a814c05deaf5dde929ba82803f5170bbc"; - hash = "sha256-83F2hFAXHLg4l5O0+j3zbwTv0TaCWEfWErO9C0V9W04="; + rev = "992e573ca58e55ae33c420ea0f620b2daf5fa9c0"; + hash = "sha256-vuRB+0gmwUmFnt+A6m6aa0c54dPZSY4EohHjTcRQRZs="; }; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -390,14 +391,14 @@ buildLuarocksPackage { dkjson = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; - version = "2.7-1"; + version = "2.8-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/dkjson-2.7-1.rockspec"; - sha256 = "0kgrgyn848hadsfhf2wccamgdpjs1cz7424fjp9vfqzjbwa06lxd"; + url = "mirror://luarocks/dkjson-2.8-1.rockspec"; + sha256 = "060410qpbsvmw2kwbkwh5ivcpnqqcbmcj4dxhf8hvjgvwljsrdka"; }).outPath; src = fetchurl { - url = "http://dkolf.de/dkjson-lua/dkjson-2.7.tar.gz"; - sha256 = "sha256-TFGmIQLy9r23Z3fx23NgUJtKARaANYi06CVfQ1ryOVw="; + url = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz"; + hash = "sha256-JOjNO+uRwchh63uz+8m9QYu/+a1KpdBHGBYlgjajFTI="; }; disabled = luaOlder "5.1" || luaAtLeast "5.5"; @@ -435,14 +436,14 @@ buildLuarocksPackage { fidget-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fidget.nvim"; - version = "1.1.0-1"; + version = "1.4.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fidget.nvim-1.1.0-1.rockspec"; - sha256 = "0pgjbsqp6bs9kwi0qphihwhl47j1lzdgg3xfa6msikrcf8d7j0hf"; + url = "mirror://luarocks/fidget.nvim-1.4.1-1.rockspec"; + sha256 = "1dfhwa6dgca88h6p9h75qlkcx3qsl8g4aflvndd7vjcimlnfiqqd"; }).outPath; src = fetchzip { - url = "https://github.com/j-hui/fidget.nvim/archive/300018af4abd00610a345e382ca1f4b7ba420f77.zip"; - sha256 = "0bwjcqkb735wqnzc8rngvpq1b2rxgc7m0arjypvnvzsxw6wd1f61"; + url = "https://github.com/j-hui/fidget.nvim/archive/1ba38e4cbb24683973e00c2e36f53ae64da38ef5.zip"; + sha256 = "0g0z1g1nmrjmg9298vg2ski6m41f1yhpas8kr9mi8pa6ibk4m63x"; }; disabled = luaOlder "5.1"; @@ -460,7 +461,7 @@ buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/fifo-0.2-0.rockspec"; + url = "mirror://luarocks/fifo-0.2-0.rockspec"; sha256 = "0vr9apmai2cyra2n573nr3dyk929gzcs4nm1096jdxcixmvh2ymq"; }).outPath; src = fetchzip { @@ -528,14 +529,14 @@ buildLuarocksPackage { fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.1243-1"; + version = "0.0.1349-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1243-1.rockspec"; - sha256 = "1qg36v2gx36k313jisxyf6yjywzqngak2qcx211hd2wzxdnsaxdb"; + url = "mirror://luarocks/fzf-lua-0.0.1349-1.rockspec"; + sha256 = "0v9frrq896d3k3xvz0ch51r2chrw4kalp5d2jb365wpnk4zda1lj"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/9a0912d171940e8701d1f65d5ee2b23b810720c1.zip"; - sha256 = "0xzgpng4r9paza87fnxc3cfn331g1pmcayv1vky7jmriy5xsrxh6"; + url = "https://github.com/ibhagwan/fzf-lua/archive/1ec6eeda11c3a3dcd544e1c61ad4b8c9b49903c4.zip"; + sha256 = "0iw3khl164qvypm7v591gyncjfpmwx6wy45a80zz922iiifgjfgd"; }; disabled = luaOlder "5.1"; @@ -579,8 +580,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "035da036e68e509ed158414416c827d022d914bd"; - hash = "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw="; + rev = "17e8fd66182c9ad79dc129451ad015af3d27529c"; + hash = "sha256-Mq3NC/DpEEOZlgKctjQqa1RMJHVSAy6jfL4IitObgzs="; }; disabled = lua.luaversion != "5.1"; @@ -595,14 +596,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "3.1.8-1"; + version = "3.1.10-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-3.1.8-1.rockspec"; - sha256 = "1jhms5gpah8lk0mn1gx127afmihyaq1fj8qrd6a8yh3wy12k1qxc"; + url = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec"; + sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.8.zip"; - sha256 = "14nk6jyq2y4q93ij56bdjy17h3jlmjwsspw3l6ahvjsl6yg1lv75"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip"; + sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv"; }; disabled = luaOlder "5.1"; @@ -642,14 +643,14 @@ buildLuarocksPackage { image-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, magick }: buildLuarocksPackage { pname = "image.nvim"; - version = "1.2.0-1"; + version = "1.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec"; - sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508"; + url = "mirror://luarocks/image.nvim-1.3.0-1.rockspec"; + sha256 = "1ls3v5xcgmqmscqk5prpj0q9sy0946rfb2dfva5f1axb5x4jbvj9"; }).outPath; src = fetchzip { - url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip"; - sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg"; + url = "https://github.com/3rd/image.nvim/archive/v1.3.0.zip"; + sha256 = "0fbc3wvzsck8bbz8jz5piy68w1xmq5cnhaj1lw91d8hkyjryrznr"; }; disabled = luaOlder "5.1"; @@ -1108,7 +1109,7 @@ buildLuarocksPackage { pname = "lua-ffi-zlib"; version = "0.6-0"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-ffi-zlib-0.6-0.rockspec"; + url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; }).outPath; src = fetchFromGitHub { @@ -1153,7 +1154,7 @@ buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-lsp-0.1.0-2.rockspec"; + url = "mirror://luarocks/lua-lsp-0.1.0-2.rockspec"; sha256 = "19jsz00qlgbyims6cg8i40la7v8kr7zsxrrr3dg0kdg0i36xqs6c"; }).outPath; src = fetchFromGitHub { @@ -1198,16 +1199,16 @@ buildLuarocksPackage { lua-protobuf = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.5.1-1"; + version = "0.5.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.5.1-1.rockspec"; - sha256 = "1ljn0xwrhcr49k4fzrh0g1q13j16sa6h3wd5q62995q4jlrmnhja"; + url = "mirror://luarocks/lua-protobuf-0.5.2-1.rockspec"; + sha256 = "0vi916qn0rbc2xhlf766vja403hwikkglza879yxm77j4n7ywrqb"; }).outPath; src = fetchFromGitHub { owner = "starwing"; repo = "lua-protobuf"; - rev = "0.5.1"; - hash = "sha256-Di4fahYlTFfJ2xM6KMs5BY44JV7IKBxxR345uk8X9W8="; + rev = "0.5.2"; + hash = "sha256-8x6FbaSUcwI1HiVvCr/726CgQSUxkUWqTNJH9pRLbJ0="; }; disabled = luaOlder "5.1"; @@ -1297,16 +1298,16 @@ buildLuarocksPackage { lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "1.3.1-1"; + version = "1.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-1.3.1-1.rockspec"; - sha256 = "1rqsmsnnnz78yb0x2xf7764l3rk54ngk3adm6an4g7dm5kryv33f"; + url = "mirror://luarocks/lua-resty-openssl-1.4.0-1.rockspec"; + sha256 = "027fqpbhq0ygh9z7za2hv7wm6ylll8km4czvjfclscm4p55bj10q"; }).outPath; src = fetchFromGitHub { owner = "fffonion"; repo = "lua-resty-openssl"; - rev = "1.3.1"; - hash = "sha256-4h6oIdiMyW9enJToUBtRuUdnKSyWuFFxIDvj4dFRKDs="; + rev = "1.4.0"; + hash = "sha256-gmsKpt42hgjqhzibYXbdWyj2MqOyC8FlhMY7xiXdtFQ="; }; @@ -1553,16 +1554,16 @@ buildLuarocksPackage { luacheck = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; - version = "1.1.2-1"; + version = "1.2.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.2-1.rockspec"; - sha256 = "11p7kf7v1b5rhi3m57g2zqwzmnnp79v76gh13b0fg2c78ljkq1k9"; + url = "mirror://luarocks/luacheck-1.2.0-1.rockspec"; + sha256 = "0jnmrppq5hp8cwiw1daa33cdn8y2n5lsjk8vzn7ixb20ddz01m6c"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luacheck"; - rev = "v1.1.2"; - hash = "sha256-AUEHRuldlnuxBWGRzcbjM4zu5IBGfbNEUakPmpS4VIo="; + rev = "v1.2.0"; + hash = "sha256-6aDXZRLq2c36dbasyVzcecQKoMvY81RIGYasdF211UY="; }; disabled = luaOlder "5.1"; @@ -1628,7 +1629,7 @@ buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.3-1"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luadbi-mysql-0.7.3-1.rockspec"; + url = "mirror://luarocks/luadbi-mysql-0.7.3-1.rockspec"; sha256 = "1x0pl6qpdi4vmhxs2076kkxmikbv0asndh8lp34r47lym37hcrr3"; }).outPath; src = fetchFromGitHub { @@ -1889,6 +1890,30 @@ buildLuarocksPackage { }; }) {}; +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: +buildLuarocksPackage { + pname = "luaposix"; + version = "34.1.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; + sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; + }).outPath; + src = fetchzip { + url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; + }; + + disabled = luaOlder "5.1" || luaAtLeast "5.4"; + propagatedBuildInputs = [ bit32 ]; + + meta = { + homepage = "http://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + maintainers = with lib.maintainers; [ vyp lblasc ]; + license.fullName = "MIT/X11"; + }; +}) {}; + luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luaprompt"; @@ -1910,30 +1935,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/dpapavas/luaprompt"; description = "A Lua command prompt with pretty-printing and auto-completion"; - license.fullName = "MIT/X11"; - }; -}) {}; - -luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }: -buildLuarocksPackage { - pname = "luaposix"; - version = "34.1.1-1"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/luaposix-34.1.1-1.rockspec"; - sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; - }).outPath; - src = fetchzip { - url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; - sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; - }; - - disabled = luaOlder "5.1" || luaAtLeast "5.4"; - propagatedBuildInputs = [ bit32 ]; - - meta = { - homepage = "http://github.com/luaposix/luaposix/"; - description = "Lua bindings for POSIX"; - maintainers = with lib.maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ Freed-Wu ]; license.fullName = "MIT/X11"; }; }) {}; @@ -1963,16 +1965,16 @@ buildLuarocksPackage { luarocks = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }: buildLuarocksPackage { pname = "luarocks"; - version = "3.11.0-1"; + version = "3.11.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-3.11.0-1.rockspec"; - sha256 = "0pi55445dskpw6nhrq52589h4v39fsf23c0kp8d4zg2qaf6y2n38"; + url = "mirror://luarocks/luarocks-3.11.1-1.rockspec"; + sha256 = "0xg0siza8nlnnkaarmw73q12qx3frlfbysd5ipmxxi1d7yc38bbn"; }).outPath; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; - rev = "v3.11.0"; - hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4="; + rev = "v3.11.1"; + hash = "sha256-GglygI8HP+aDFEuucOkjQ2Pgfv4+jW+og+2vL3KoZCQ="; }; @@ -2008,21 +2010,21 @@ buildLuarocksPackage { }; }) {}; -luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, luafilesystem }: +luarocks-build-treesitter-parser = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luarocks-build-treesitter-parser"; - version = "2.0.0-1"; + version = "4.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luarocks-build-treesitter-parser-2.0.0-1.rockspec"; - sha256 = "0ylax1r0yl5k742p8n0fq5irs2r632npigqp1qckfx7kwi89gxhb"; + url = "mirror://luarocks/luarocks-build-treesitter-parser-4.1.0-1.rockspec"; + sha256 = "0r3r8dvjn9zvpj06932ijqwypq636zv2vpq5pcj83xfvvi3fd2rw"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v2.0.0.zip"; - sha256 = "0gqiwk7dk1xn5n2m0iq5c7xkrgyaxwyd1spb573l289gprvlrbn5"; + url = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser/archive/v4.1.0.zip"; + sha256 = "1838q30n2xjb8cmhlzxax0kzvxhsdrskkk4715kkca8zk6i3zm98"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua luafilesystem ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ luafilesystem ]; meta = { homepage = "https://github.com/nvim-neorocks/luarocks-build-treesitter-parser"; @@ -2158,16 +2160,16 @@ buildLuarocksPackage { luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luasystem"; - version = "0.3.0-2"; + version = "0.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasystem-0.3.0-2.rockspec"; - sha256 = "02kwkcwf81v6ncxl1ng2pxlhalz78q2476snh5xxv3wnwqwbp10a"; + url = "mirror://luarocks/luasystem-0.4.0-1.rockspec"; + sha256 = "0brvqqxfz1w4l4nzaxds1d17flq7rx6lw8pjb565fyb2jhg39qc9"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; repo = "luasystem"; - rev = "v0.3.0"; - hash = "sha256-oTFH0x94gSo1sqk1GsDheoVrjJHxFWZLtlJ45GwupoU="; + rev = "v0.4.0"; + hash = "sha256-I1dG6ccOQAwpe18DjiYijKjerk+yDRic6fEERSte2Ks="; }; disabled = luaOlder "5.1"; @@ -2573,14 +2575,14 @@ buildLuarocksPackage { neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }: buildLuarocksPackage { pname = "neotest"; - version = "5.2.3-1"; + version = "5.3.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neotest-5.2.3-1.rockspec"; - sha256 = "16pwkwv2dmi9aqhp6bdbgwhksi891iz73rvksqmv136jx6fi7za1"; + url = "mirror://luarocks/neotest-5.3.3-1.rockspec"; + sha256 = "0bji9bfh129l9find3asakr97pxq76gdjp96gyibv02m4j0hgqjz"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/neotest/archive/5caac5cc235d495a2382bc2980630ef36ac87032.zip"; - sha256 = "1i1d6m17wf3p76nm75jk4ayd4zyhslmqi2pc7j8qx87391mnz2c4"; + url = "https://github.com/nvim-neotest/neotest/archive/f30bab1faef13d47f3905e065215c96a42d075ad.zip"; + sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; }; disabled = luaOlder "5.1"; @@ -2649,8 +2651,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8f3c541407e691af6163e2447f3af1bd6e17f9a3"; - hash = "sha256-rz+JMd/hsUEDNVan2sCuEGtbsOVi6oRmPtps+7qSXQE="; + rev = "a110e12d0b58eefcf5b771f533fc2cf3050680ac"; + hash = "sha256-7tEfEjWH5pneI10jLYpenoysRQPa2zPGLTNcbMX3x2I="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2665,14 +2667,14 @@ buildLuarocksPackage { nvim-nio = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "nvim-nio"; - version = "1.9.0-1"; + version = "1.9.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/nvim-nio-1.9.0-1.rockspec"; - sha256 = "0hwjkz0pjd8dfc4l7wk04ddm8qzrv5m15gskhz9gllb4frnk6hik"; + url = "mirror://luarocks/nvim-nio-1.9.4-1.rockspec"; + sha256 = "05xccwawl82xjwxmpihb6v4l7sp0msc6hhgs8mgzbsclznf78052"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neotest/nvim-nio/archive/v1.9.0.zip"; - sha256 = "0y3afl42z41ymksk29al5knasmm9wmqzby860x8zj0i0mfb1q5k5"; + url = "https://github.com/nvim-neotest/nvim-nio/archive/7969e0a8ffabdf210edd7978ec954a47a737bbcc.zip"; + sha256 = "0ip31k5rnmv47rbka1v5mhljmff7friyj4gcqzz4hqj1yccfl1l0"; }; disabled = luaOlder "5.1"; @@ -2708,13 +2710,13 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder, luafilesystem }: +penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "penlight"; - version = "1.14.0-1"; + version = "1.14.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/penlight-1.14.0-1.rockspec"; - sha256 = "1zmibf0pgcnf0lj1xmxs0srbyy1cswvb9g1jajy9lhicnpqqlgvh"; + url = "mirror://luarocks/penlight-1.14.0-2.rockspec"; + sha256 = "0gs07q81mkrk9i0hhqvd8nf5vzmv540ch2hiw4rcqg18vbyincq7"; }).outPath; src = fetchFromGitHub { owner = "lunarmodules"; @@ -2723,7 +2725,6 @@ buildLuarocksPackage { hash = "sha256-4zAt0GgQEkg9toaUaDn3ST3RvjLUDsuOzrKi9lhq0fQ="; }; - disabled = luaOlder "5.1"; propagatedBuildInputs = [ luafilesystem ]; meta = { @@ -2742,8 +2743,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "08e301982b9a057110ede7a735dd1b5285eb341f"; - hash = "sha256-vy0MXEoSM4rvYpfwbc2PnilvMOA30Urv0FAxjXuvqQ8="; + rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; + hash = "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2829,14 +2830,14 @@ buildLuarocksPackage { rocks-config-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, rocks-nvim }: buildLuarocksPackage { pname = "rocks-config.nvim"; - version = "1.5.0-1"; + version = "2.0.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-config.nvim-1.5.0-1.rockspec"; - sha256 = "14rj1p7grmdhi3xm683c3c441xxcldhi5flh6lg1fab1rm9mij6b"; + url = "mirror://luarocks/rocks-config.nvim-2.0.0-1.rockspec"; + sha256 = "0vkzhz6szbm6cy4301c103kck36zgk8ig2ssipclca392cq36716"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v1.5.0.zip"; - sha256 = "0kpvd9ddj1vhkz54ckqsym4fbj1krzpp8cslb20k8qk2n1ccjynv"; + url = "https://github.com/nvim-neorocks/rocks-config.nvim/archive/v2.0.0.zip"; + sha256 = "1gzpcvb79s8a0mxq331fhwgik4bkaj254avri50wm1y5qxb4n3nx"; }; disabled = luaOlder "5.1"; @@ -2850,21 +2851,21 @@ buildLuarocksPackage { }; }) {}; -rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, nvim-nio, rocks-nvim }: +rocks-dev-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim, rtp-nvim }: buildLuarocksPackage { pname = "rocks-dev.nvim"; - version = "1.1.2-1"; + version = "1.2.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-dev.nvim-1.1.2-1.rockspec"; - sha256 = "09yz84akkparvqfsjpslxpv3wzvkjrbqil8fxwl5crffggn5mz1b"; + url = "mirror://luarocks/rocks-dev.nvim-1.2.3-1.rockspec"; + sha256 = "0xhl0rmklhhlcsn268brj7hhl5lk2djhkllzna2rnjaq80cwsh5j"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.1.2.zip"; - sha256 = "19g8dlz2zch0sz21zm92l6ic81bx68wklidjw94xrjyv26139akc"; + url = "https://github.com/nvim-neorocks/rocks-dev.nvim/archive/v1.2.3.zip"; + sha256 = "17sv49wl366jxriy0cxy3b1z8vans58jmjg4ap5dc9fmg6687jgs"; }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua nvim-nio rocks-nvim ]; + disabled = luaOlder "5.1"; + propagatedBuildInputs = [ nvim-nio rocks-nvim rtp-nvim ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks-dev.nvim"; @@ -2877,14 +2878,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "1.4.0-1"; + version = "1.5.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-1.4.0-1.rockspec"; - sha256 = "04zx6yvp5pg306wqaw6fymqci5qnzpzg27xjrycflcyxxq4xmnmg"; + url = "mirror://luarocks/rocks-git.nvim-1.5.1-1.rockspec"; + sha256 = "0if5vaxggf4ryik5szm1p5dv324sybm9h3jbpl78ydd1kf0702m6"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.4.0.zip"; - sha256 = "0yjigf9pzy53yylznnnb68dwmylx9a3qv84kdc2whsf4cj23m2nj"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v1.5.1.zip"; + sha256 = "05g31js2k2jjrz0a633vdfz21ji1a2by79yrfhi6wdmp167a5w99"; }; disabled = luaOlder "5.1"; @@ -2898,21 +2899,21 @@ buildLuarocksPackage { }; }) {}; -rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, nvim-nio, rtp-nvim, toml-edit }: +rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }: buildLuarocksPackage { pname = "rocks.nvim"; - version = "2.26.0-1"; + version = "2.31.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.26.0-1.rockspec"; - sha256 = "1piypyxq1c6l203f3w8z4fhfi649h5ppl58lckvxph9dvidg11lf"; + url = "mirror://luarocks/rocks.nvim-2.31.3-1.rockspec"; + sha256 = "1rrsshsi6c5njcyaibz1mdvhyjl4kf2973kwahyk84j52fmwzwjv"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.26.0.zip"; - sha256 = "10wck99dfwxv49pkd9pva7lqr4a79zccbqvb75qbxkgnj0yd5awc"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.31.3.zip"; + sha256 = "07500g0jvicbxqmsqdb3dcjpmvd6wgwk8g34649f94nhqk3lglx5"; }; disabled = luaOlder "5.1"; - propagatedBuildInputs = [ fidget-nvim fzy nvim-nio rtp-nvim toml-edit ]; + propagatedBuildInputs = [ fidget-nvim fzy luarocks nvim-nio rtp-nvim toml-edit ]; meta = { homepage = "https://github.com/nvim-neorocks/rocks.nvim"; @@ -2922,8 +2923,7 @@ buildLuarocksPackage { }; }) {}; - -rtp-nvim = callPackage ({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +rtp-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rtp.nvim"; version = "1.0.0-1"; @@ -2941,6 +2941,7 @@ buildLuarocksPackage { meta = { homepage = "https://github.com/nvim-neorocks/rtp.nvim"; description = "Source plugin and ftdetect directories on the Neovim runtimepath."; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "GPL-3.0"; }; }) {}; @@ -2948,14 +2949,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "4.22.8-1"; + version = "4.25.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-4.22.8-1.rockspec"; - sha256 = "18hghs9v9j3kv3fxwdp7qk9vhbxn4c8xd8pyxwnyjq5ad7ninr82"; + url = "mirror://luarocks/rustaceanvim-4.25.1-1.rockspec"; + sha256 = "1lrjybnicbyl9rh0qcp846s6b57gryca0fw719c8h8pasb9kf1m0"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/4.22.8.zip"; - sha256 = "1n9kqr8xdqamc8hd8a155h7rzyda8bz39n0zdgdw0j8hqc214vmm"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/4.25.1.zip"; + sha256 = "1rym8n7595inb9zdrmw7jwp5iy5r28b7mfjs4k2mvmlby9fxcmz0"; }; disabled = luaOlder "5.1"; @@ -2997,8 +2998,8 @@ buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; knownRockspec = (fetchurl { - url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/serpent-0.30-2.rockspec"; - sha256 = "01696wwp1m8jlcj0y1wwscnz3cpcjdvm8pcnc6c6issa2s4544vr"; + url = "mirror://luarocks/serpent-0.30-2.rockspec"; + sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n"; }).outPath; src = fetchFromGitHub { owner = "pkulchenko"; @@ -3136,14 +3137,14 @@ buildLuarocksPackage { telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "1.0.2-1"; + version = "1.0.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-1.0.2-1.rockspec"; - sha256 = "0a5cg3kx2pv8jsr0jdpxd1ahprh55n12ggzlqiailyyskzpx94bl"; + url = "mirror://luarocks/telescope-manix-1.0.3-1.rockspec"; + sha256 = "0avqlglmki244q3ffnlc358z3pn36ibcqysxrxw7h6qy1zcwm8sr"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.2.zip"; - sha256 = "0y3n270zkii123r3987xzvp194dl0q1hy234v95w7l48cf4v495k"; + url = "https://github.com/mrcjkb/telescope-manix/archive/1.0.3.zip"; + sha256 = "186rbdddpv8q0zcz18lnkarp0grdzxp80189n4zj2mqyzqnw0svj"; }; disabled = luaOlder "5.1"; @@ -3167,8 +3168,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "35f94f0ef32d70e3664a703cefbe71bd1456d899"; - hash = "sha256-AtvZ7b2bg+Iaei4rRzTBYf76vHJH2Yq5tJAJZrZw/pk="; + rev = "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed"; + hash = "sha256-0fS3RYO/9gwmdK2H9Y/4Z/P++4aEHTHJqR2mH0vWAFY="; }; disabled = lua.luaversion != "5.1"; @@ -3232,39 +3233,6 @@ buildLuarocksPackage { }; }) {}; -toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: -buildLuarocksPackage { - pname = "toml"; - version = "0.3.0-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/toml-0.3.0-0.rockspec"; - sha256 = "0y4qdzsvf4xwnr49xcpbqclrq9d6snv83cbdkrchl0cn4cx6zpxy"; - }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/LebJe/toml.lua.git", - "rev": "319e9accf8c5cedf68795354ba81e54c817d1277", - "date": "2023-02-19T23:00:49-05:00", - "path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua", - "sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq", - "hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path" "sha256"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "https://github.com/LebJe/toml.lua"; - description = "TOML v1.0.0 parser and serializer for Lua. Powered by toml++."; - maintainers = with lib.maintainers; [ mrcjkb ]; - license.fullName = "MIT"; - }; -}) {}; - toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; @@ -3289,7 +3257,7 @@ buildLuarocksPackage { }; }) {}; -tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }: +tree-sitter-norg = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }: buildLuarocksPackage { pname = "tree-sitter-norg"; version = "0.2.4-1"; @@ -3302,10 +3270,12 @@ buildLuarocksPackage { sha256 = "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd"; }; + nativeBuildInputs = [ luarocks-build-treesitter-parser ]; meta = { homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; description = "The official tree-sitter parser for Norg documents."; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; }; }) {}; @@ -3361,16 +3331,16 @@ buildLuarocksPackage { xml2lua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "xml2lua"; - version = "1.5-2"; + version = "1.6-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/xml2lua-1.5-2.rockspec"; - sha256 = "1h0zszjzi65jc2rmpam7ai38sx2ph09q66jkik5mgzr6cxm1cm4h"; + url = "mirror://luarocks/xml2lua-1.6-2.rockspec"; + sha256 = "1fh57kv95a18q4869hmr4fbzbnlmq5z83mkkixvwzg3szf9kvfcn"; }).outPath; src = fetchFromGitHub { owner = "manoelcampos"; repo = "xml2lua"; - rev = "v1.5-2"; - hash = "sha256-hDCUTM+EM9Z+rCg+CbL6qLzY/5qaz6J1Q2khfBlkY+4="; + rev = "v1.6-2"; + hash = "sha256-4il5mmRLtuyCJ2Nm1tKv2hXk7rmiq7Fppx9LMbjkne0="; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 34338bf96b84d..99fe9217c9602 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -326,11 +326,15 @@ in ''; }); + lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs(oa: { + meta = oa.meta // { broken = true; }; + }); + lua-zlib = prev.lua-zlib.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ zlib.dev ]; - meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; + meta = oa.meta // { broken = luaOlder "5.1" || luaAtLeast "5.4"; }; }); luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: { @@ -787,19 +791,6 @@ in nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ]; }); - toml = prev.toml.overrideAttrs (oa: { - patches = [ ./toml.patch ]; - - nativeBuildInputs = oa.nativeBuildInputs ++ [ tomlplusplus ]; - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ sol2 ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "TOML_PLUS_PLUS_SRC" "${tomlplusplus.src}/include/toml++" \ - --replace-fail "MAGIC_ENUM_SRC" "${magic-enum.src}/include/magic_enum" - ''; - }); - toml-edit = prev.toml-edit.overrideAttrs (oa: { cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 97ec85f6f2e9e..3d0f43258a056 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -9,6 +9,7 @@ , meson , ninja , python3 +, yelp-xsl }: python3.pkgs.buildPythonApplication rec { @@ -35,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ itstool # build script checks for its presence but I am not sure if anything uses it - gnome.yelp-xsl + yelp-xsl ]; pythonPath = [ diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 4a4e34e25070d..e037716b3d67a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -84,8 +84,10 @@ mapAliases { inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 inherit (pkgs) firebase-tools; # added 2023-08-18 + inherit (pkgs) fixjson; # added 2024-06-26 flood = pkgs.flood; # Added 2023-07-25 generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 + inherit (pkgs) git-run; # added 2024-06-26 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 inherit (pkgs) git-standup; # added 2024-06-26 inherit (pkgs) gitmoji-cli; # added 2023-09-23 @@ -111,6 +113,7 @@ mapAliases { karma = pkgs.karma-runner; # added 2023-07-29 leetcode-cli = vsc-leetcode-cli; # added 2023-08-31 manta = pkgs.node-manta; # Added 2023-05-06 + inherit (pkgs) markdown-link-check; # added 2024-06-28 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 inherit (pkgs) mathjax-node-cli; # added 2023-11-02 @@ -119,6 +122,7 @@ mapAliases { musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 inherit (pkgs) near-cli; # added 2023-09-09 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) nodemon; # added 2024-06-28 inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 parcel-bundler = parcel; # added 2023-09-04 @@ -166,9 +170,13 @@ mapAliases { inherit (pkgs) titanium; # added 2023-08-17 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 + inherit (pkgs) uglify-js; # added 2024-06-15 inherit (pkgs) ungit; # added 2023-08-20 inherit (pkgs) vim-language-server; # added 2024-06-25 inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30 + vscode-css-languageserver-bin = throw "vscode-css-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 + vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 + vscode-json-languageserver-bin = throw "vscode-json-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 vue-cli = self."@vue/cli"; # added 2023-08-18 vue-language-server = self.vls; # added 2023-08-20 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 20102095ffc98..aa638a37d3984 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -30,7 +30,6 @@ fauna-shell = "fauna"; fkill-cli = "fkill"; fleek-cli = "fleek"; - git-run = "gr"; graphql-cli = "graphql"; graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; @@ -53,11 +52,7 @@ remod-cli = "remod"; teck-programmer = "teck-firmware-upgrade"; typescript-language-server = "typescript-language-server"; - uglify-js = "uglifyjs"; undollar = "$"; - vscode-css-languageserver-bin = "css-languageserver"; - vscode-html-languageserver-bin = "html-languageserver"; - vscode-json-languageserver-bin = "json-languageserver"; vscode-json-languageserver = "vscode-json-languageserver"; webtorrent-cli = "webtorrent"; } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 4cb74a9183ec5..d03ecc442155f 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -102,14 +102,12 @@ , "expo-cli" , "fast-cli" , "fauna-shell" -, "fixjson" , "fkill-cli" , "fleek-cli" , "forever" , "fx" , "ganache" , "gatsby-cli" -, "git-run" , "@gitbeaker/cli" , "grammarly-languageserver" , "graphql" @@ -152,7 +150,6 @@ , "lua-fmt" , "lv_font_conv" , "madoko" -, "markdown-link-check" , "mastodon-bot" , "mathjax" , "meat" @@ -165,7 +162,6 @@ , "node-pre-gyp" , "node-red" , "node2nix" -, "nodemon" , "np" , "npm" , "npm-merge-driver" @@ -254,17 +250,13 @@ , "ts-node" , "ttf2eot" , "typescript-language-server" -, "uglify-js" , "undollar" , "unified-language-server" , "vega-cli" , "vega-lite" , "vercel" , "vls" -, "vscode-css-languageserver-bin" -, "vscode-html-languageserver-bin" , "vscode-json-languageserver" -, "vscode-json-languageserver-bin" , "wavedrom-cli" , "webpack" , "webpack-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index db0e664c77138..8a088f092e21a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -29653,15 +29653,6 @@ let sha512 = "K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA=="; }; }; - "html-link-extractor-1.0.5" = { - name = "html-link-extractor"; - packageName = "html-link-extractor"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/html-link-extractor/-/html-link-extractor-1.0.5.tgz"; - sha512 = "ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw=="; - }; - }; "html-minifier-4.0.0" = { name = "html-minifier"; packageName = "html-minifier"; @@ -30310,15 +30301,6 @@ let sha512 = "5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw=="; }; }; - "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=="; - }; - }; "ignore-walk-3.0.4" = { name = "ignore-walk"; packageName = "ignore-walk"; @@ -31354,15 +31336,6 @@ let sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; }; - "is-absolute-url-4.0.1" = { - name = "is-absolute-url"; - packageName = "is-absolute-url"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz"; - sha512 = "/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A=="; - }; - }; "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; @@ -32371,15 +32344,6 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; - "is-relative-url-4.0.0" = { - name = "is-relative-url"; - packageName = "is-relative-url"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative-url/-/is-relative-url-4.0.0.tgz"; - sha512 = "PkzoL1qKAYXNFct5IKdKRH/iBQou/oCC85QhXj6WKtUQBliZ4Yfd3Zk27RHu9KQG8r6zgvAA2AQKC9p+rqTszg=="; - }; - }; "is-resolvable-1.1.0" = { name = "is-resolvable"; packageName = "is-resolvable"; @@ -32794,15 +32758,6 @@ let sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; }; - "isemail-3.2.0" = { - name = "isemail"; - packageName = "isemail"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz"; - sha512 = "zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg=="; - }; - }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -33703,15 +33658,6 @@ let sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; }; - "json5-relaxed-0.5.4" = { - name = "json5-relaxed"; - packageName = "json5-relaxed"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/json5-relaxed/-/json5-relaxed-0.5.4.tgz"; - sha512 = "oDPf7b6nFDKcX2qt5OLI/ZwGwH43qS/g2Z98UWo8ChoNtVMYdGa3Y48WHvjPqvNKnTUa2fOanvHFeE7ZxkiboQ=="; - }; - }; "jsonata-1.8.7" = { name = "jsonata"; packageName = "jsonata"; @@ -34747,15 +34693,6 @@ let sha512 = "8oI90ziJlcTi4k2DnQ0o0Waa2Uk00xbIN8ylvhstEqfJtiRaB4LJ6u8H63If7zTrnnuhCw8SjTJoHf+wLs3ICg=="; }; }; - "link-check-5.3.0" = { - name = "link-check"; - packageName = "link-check"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-5.3.0.tgz"; - sha512 = "Jhb7xueDgQgBaZzkfOtAyOZEZAIMJQIjUpYD2QY/zEB+LKTY1tWiBwZg8QIDbzQdPBOcqzg7oLQDNcES/tQmXg=="; - }; - }; "linkify-it-2.2.0" = { name = "linkify-it"; packageName = "linkify-it"; @@ -36818,15 +36755,6 @@ let sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ=="; }; }; - "markdown-link-extractor-4.0.2" = { - name = "markdown-link-extractor"; - packageName = "markdown-link-extractor"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-4.0.2.tgz"; - sha512 = "5cUOu4Vwx1wenJgxaudsJ8xwLUMN7747yDJX3V/L7+gi3e4MsCm7w5nbrDQQy8nEfnl4r5NV3pDXMAjhGXYXAw=="; - }; - }; "markdown-table-3.0.3" = { name = "markdown-table"; packageName = "markdown-table"; @@ -36836,15 +36764,6 @@ let sha512 = "Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw=="; }; }; - "marked-12.0.2" = { - name = "marked"; - packageName = "marked"; - version = "12.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz"; - sha512 = "qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q=="; - }; - }; "marked-4.3.0" = { name = "marked"; packageName = "marked"; @@ -37601,15 +37520,6 @@ let sha512 = "/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg=="; }; }; - "microee-0.0.6" = { - name = "microee"; - packageName = "microee"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; - sha512 = "/LdL3jiBWDJ3oQIRLgRhfeCZNE3patM1LiwCC124+/HHn10sI/G2OAyiMfTNzH5oYWoZBk0tRZADAUOv+0Wt0A=="; - }; - }; "micromark-2.11.4" = { name = "micromark"; packageName = "micromark"; @@ -38465,15 +38375,6 @@ let sha512 = "J6aXmkII5gcq+kC4TurxKiR4rC++apPST/K8P/YjqoQQgrJ+NRPacBhf6iVh8R3ujnXYXaq+Ae+gm+LM0XHK/w=="; }; }; - "minilog-3.1.0" = { - name = "minilog"; - packageName = "minilog"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; - sha512 = "Xfm4jWjWzSAduvEWtuZX/8TMkxfJlCfH7XvikCZe3ptojYTBq1eoEs3rh9/3LNLOckUP86m+8l8+Iw5NU/pBww=="; - }; - }; "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; @@ -44874,15 +44775,6 @@ let 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"; @@ -49194,15 +49086,6 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-1.132.0" = { - name = "simple-git"; - packageName = "simple-git"; - version = "1.132.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz"; - sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg=="; - }; - }; "simple-git-2.21.0" = { name = "simple-git"; packageName = "simple-git"; @@ -49257,15 +49140,6 @@ let sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; }; - "simple-update-notifier-2.0.0" = { - name = "simple-update-notifier"; - packageName = "simple-update-notifier"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz"; - sha512 = "a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w=="; - }; - }; "simple-websocket-4.3.1" = { name = "simple-websocket"; packageName = "simple-websocket"; @@ -51786,16 +51660,6 @@ let sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw=="; }; }; - "tabtab-git+https://github.com/mixu/node-tabtab.git" = { - name = "tabtab"; - packageName = "tabtab"; - version = "0.0.2"; - src = fetchgit { - url = "https://github.com/mixu/node-tabtab.git"; - rev = "94af2b878b174527b6636aec88acd46979247755"; - sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; - }; - }; "tailwindcss-3.4.4" = { name = "tailwindcss"; packageName = "tailwindcss"; @@ -52732,15 +52596,6 @@ let sha512 = "sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ=="; }; }; - "touch-3.1.1" = { - name = "touch"; - packageName = "touch"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-3.1.1.tgz"; - sha512 = "r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA=="; - }; - }; "tough-cookie-2.4.3" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -53866,15 +53721,6 @@ let 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=="; - }; - }; "underscore-1.13.6" = { name = "underscore"; packageName = "underscore"; @@ -72703,55 +72549,6 @@ in bypassCache = true; reconstructLock = true; }; - fixjson = nodeEnv.buildNodePackage { - name = "fixjson"; - packageName = "fixjson"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fixjson/-/fixjson-1.1.2.tgz"; - sha512 = "NptKAXT3UrePy8JfK6ww/yiwqjVipouoEYUucKVpLNOiOWsrZ7XtcG3iUWpb3yGUoaN7OEafsd3cEGFMIjoXUQ=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."detect-indent-6.1.0" - sources."emoji-regex-8.0.0" - sources."escalade-3.1.2" - sources."fs.realpath-1.0.0" - sources."get-caller-file-2.0.5" - sources."glob-7.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" - sources."json5-relaxed-0.5.4" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."require-directory-2.1.1" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."y18n-5.0.8" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON fixer for humans using (relaxed) JSON5"; - homepage = "https://github.com/rhysd/fixjson#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; @@ -74001,35 +73798,6 @@ in bypassCache = true; reconstructLock = true; }; - git-run = nodeEnv.buildNodePackage { - name = "git-run"; - packageName = "git-run"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.5.tgz"; - sha512 = "76zCOpXUl/85CMk9aJwWbBy2vGYv+Yn17PcUMhksTtMJLAUujje3eP8v7FufC2pN9SbQx88Gtr4ARXGeVWwAJA=="; - }; - dependencies = [ - sources."async-2.6.4" - sources."debug-4.3.5" - sources."lodash-4.17.21" - sources."lodash.groupby-4.6.0" - sources."microee-0.0.6" - sources."minilog-3.1.0" - sources."ms-2.1.2" - sources."simple-git-1.132.0" - sources."tabtab-git+https://github.com/mixu/node-tabtab.git" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A tool for managing multiple git repositories"; - homepage = "https://github.com/mixu/gr#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; @@ -81046,94 +80814,6 @@ in bypassCache = true; reconstructLock = true; }; - markdown-link-check = nodeEnv.buildNodePackage { - name = "markdown-link-check"; - packageName = "markdown-link-check"; - version = "3.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.12.2.tgz"; - sha512 = "GWMwSvxuZn+uGGydi5yywnnDZy08SGps4I/63xqvWT7lxtH4cVLnhgZZYtEcPz/QvgPg9vbH2rvWpa29owMtHA=="; - }; - dependencies = [ - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."agent-base-7.1.1" - sources."ast-types-0.13.4" - sources."async-3.2.5" - sources."basic-ftp-5.0.5" - sources."boolbase-1.0.0" - sources."chalk-5.3.0" - sources."cheerio-1.0.0-rc.12" - sources."cheerio-select-2.1.0" - sources."commander-12.1.0" - sources."css-select-5.1.0" - sources."css-what-6.1.0" - sources."data-uri-to-buffer-6.0.2" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."degenerator-5.0.1" - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - sources."entities-4.5.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fs-extra-11.2.0" - sources."get-uri-6.0.3" - sources."graceful-fs-4.2.11" - sources."html-link-extractor-1.0.5" - sources."htmlparser2-8.0.2" - sources."http-proxy-agent-7.0.2" - sources."https-proxy-agent-7.0.4" - sources."iconv-lite-0.6.3" - sources."ip-address-9.0.5" - sources."is-absolute-url-4.0.1" - sources."is-relative-url-4.0.0" - sources."isemail-3.2.0" - sources."jsbn-1.1.0" - sources."jsonfile-6.1.0" - sources."link-check-5.3.0" - sources."lodash-4.17.21" - sources."lru-cache-7.18.3" - sources."markdown-link-extractor-4.0.2" - sources."marked-12.0.2" - sources."ms-2.1.3" - sources."needle-3.3.1" - sources."netmask-2.0.2" - sources."nth-check-2.1.1" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.1" - sources."parse5-7.1.2" - sources."parse5-htmlparser2-tree-adapter-7.0.0" - sources."progress-2.0.3" - sources."proxy-agent-6.4.0" - sources."proxy-from-env-1.1.0" - sources."punycode-2.3.1" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - sources."smart-buffer-4.2.0" - sources."socks-2.8.3" - sources."socks-proxy-agent-8.0.3" - sources."source-map-0.6.1" - sources."sprintf-js-1.1.3" - sources."tslib-2.6.3" - sources."universalify-2.0.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "checks the all of the hyperlinks in a markdown text to determine if they are alive or dead"; - homepage = "https://github.com/tcort/markdown-link-check#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; @@ -82624,54 +82304,6 @@ in bypassCache = true; reconstructLock = true; }; - nodemon = nodeEnv.buildNodePackage { - name = "nodemon"; - packageName = "nodemon"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-3.1.3.tgz"; - sha512 = "m4Vqs+APdKzDFpuaL9F9EVOF85+h070FnkHVEoU4+rmT6Vw0bmNl7s61VEkY/cJkL7RCv1p4urnUDUMrS5rk2w=="; - }; - dependencies = [ - sources."anymatch-3.1.3" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.3.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."chokidar-3.6.0" - sources."concat-map-0.0.1" - sources."debug-4.3.5" - sources."fill-range-7.1.1" - sources."glob-parent-5.1.2" - sources."has-flag-3.0.0" - sources."ignore-by-default-1.0.1" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."minimatch-3.1.2" - sources."ms-2.1.2" - sources."normalize-path-3.0.0" - sources."picomatch-2.3.1" - sources."pstree.remy-1.1.8" - sources."readdirp-3.6.0" - sources."semver-7.6.2" - sources."simple-update-notifier-2.0.0" - sources."supports-color-5.5.0" - sources."to-regex-range-5.0.1" - sources."touch-3.1.1" - sources."undefsafe-2.0.5" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Simple monitor script for use during development of a Node.js app."; - homepage = "https://nodemon.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; @@ -90560,24 +90192,6 @@ in bypassCache = true; reconstructLock = true; }; - uglify-js = nodeEnv.buildNodePackage { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz"; - sha512 = "SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = "https://github.com/mishoo/UglifyJS#readme"; - license = "BSD-2-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; undollar = nodeEnv.buildNodePackage { name = "undollar"; packageName = "undollar"; @@ -91554,72 +91168,6 @@ in bypassCache = true; reconstructLock = true; }; - vscode-css-languageserver-bin = nodeEnv.buildNodePackage { - name = "vscode-css-languageserver-bin"; - packageName = "vscode-css-languageserver-bin"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageserver-bin/-/vscode-css-languageserver-bin-1.4.0.tgz"; - sha512 = "KWrF5f4RYYe8RBDfqb1c0Sdf9xPS2Ly/Z/T18H+uUOMw2QyzIrkxv4bMKy5GFfPm4479k6Ln4ji4UHqSmhGf3g=="; - }; - dependencies = [ - sources."vscode-css-languageservice-3.0.13" - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-nls-4.1.2" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Binary version published on npm of vscode-css-languageserver extracted from VSCode tree"; - homepage = "https://github.com/vscode-langservers/vscode-css-languageserver-bin#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - vscode-html-languageserver-bin = nodeEnv.buildNodePackage { - name = "vscode-html-languageserver-bin"; - packageName = "vscode-html-languageserver-bin"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageserver-bin/-/vscode-html-languageserver-bin-1.4.0.tgz"; - sha512 = "rDnpvASQwf1dlRaGiu8edo5WlAr4dM3/r/dcPCH4O6UD4+eShhdC1E8IyiSisnJU6bRk+4mDTCgA6cyhGJY2xA=="; - }; - dependencies = [ - sources."typescript-2.9.2" - (sources."vscode-css-languageservice-3.0.13" // { - dependencies = [ - sources."vscode-nls-4.1.2" - ]; - }) - (sources."vscode-html-languageservice-2.1.12" // { - dependencies = [ - sources."vscode-nls-4.1.2" - ]; - }) - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-nls-3.2.5" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Binary version published on npm of vscode-html-languageserver extracted from VSCode tree"; - homepage = "https://github.com/vscode-langservers/vscode-html-languageserver-bin#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; vscode-json-languageserver = nodeEnv.buildNodePackage { name = "vscode-json-languageserver"; packageName = "vscode-json-languageserver"; @@ -91664,57 +91212,6 @@ in bypassCache = true; reconstructLock = true; }; - vscode-json-languageserver-bin = nodeEnv.buildNodePackage { - name = "vscode-json-languageserver-bin"; - packageName = "vscode-json-languageserver-bin"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageserver-bin/-/vscode-json-languageserver-bin-1.0.1.tgz"; - sha512 = "WU+Ks0OEo1c4pgFUA4gIockhzlRqWqSRL2NXHOCtYhJnuIqfrNgSyECZC+nCMyn/CnzpPuQQjzC74GWlIRXnZQ=="; - }; - dependencies = [ - sources."agent-base-4.3.0" - sources."debug-3.1.0" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-2.2.4" - sources."jsonc-parser-1.0.3" - sources."ms-2.0.0" - (sources."request-light-0.2.5" // { - dependencies = [ - sources."vscode-nls-4.1.2" - ]; - }) - (sources."vscode-json-languageservice-3.11.0" // { - dependencies = [ - sources."jsonc-parser-3.2.1" - sources."vscode-nls-5.2.0" - sources."vscode-uri-2.1.2" - ]; - }) - sources."vscode-jsonrpc-3.5.0" - sources."vscode-languageserver-3.5.1" - (sources."vscode-languageserver-protocol-3.5.1" // { - dependencies = [ - sources."vscode-languageserver-types-3.5.0" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.16.0-next.2" - sources."vscode-nls-2.0.2" - sources."vscode-uri-1.0.8" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JSON language server"; - homepage = "https://github.com/vscode-langservers/vscode-json-languageserver-bin#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index d678c129188c9..980c68298adcc 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -16,6 +16,7 @@ let p5 = camlp5; in let camlp5 = p5.override { legacy = true; }; in let fetched = coqPackages.metaFetch ({ + release."1.19.2".sha256 = "sha256-7VTUbsFVoNT6srLwcAn5WNSsWC7cVUdphKRWBHHiH5M="; release."1.18.1".sha256 = "sha256-zgBJefQDe3JyCGbC0wvMcx/9iMVbftBJ43NPogkNeHY="; release."1.17.0".sha256 = "sha256-DTxE8CvYl0et20pxueydI+WzraI6UPHMNvxyp2gU/+w="; release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index 5fd645b52113a..18308734b164a 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppx_deriving_yaml"; - version = "0.2.2"; + version = "0.3.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz"; - hash = "sha256-9xy43jaCpKo/On5sTTt8f0Mytyjj1JN2QuFMcoWYTBY="; + hash = "sha256-HLY0ozmy6zY0KjXkwP3drTdz857PvLS/buN1nB+xf1s="; }; propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 13fad457e2aee..fe7e655ba60c3 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "printbox"; - version = "0.6.1"; + version = "0.11"; useDune2 = true; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7u2ThRhM3vW4ItcFsK4ycgcaW0JcQOFoZZRq2kqbl+k="; + sha256 = "sha256-f5iTesEakULlLdDGtX+5i3vesUIbFLjcV3kJ7ZPia0Y="; }; nativeCheckInputs = [ mdx.bin ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 17dee792007bd..331eff1c1027a 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -9,13 +9,13 @@ buildDunePackage rec { pname = "shared-memory-ring"; - version = "3.1.1"; + version = "3.2.1"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-${version}.tbz"; - hash = "sha256-KW8grij/OAnFkdUdRRZF21X39DvqayzkTWeRKwF8uoU="; + hash = "sha256-qSdntsPQo0/8JlbOoO6NAYtoa86HJy5yWHUsWi/PGDM="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/tdigest/default.nix b/pkgs/development/ocaml-modules/tdigest/default.nix index 4dc40da9dac67..4dcf81d965213 100644 --- a/pkgs/development/ocaml-modules/tdigest/default.nix +++ b/pkgs/development/ocaml-modules/tdigest/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "tdigest"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "SGrondin"; repo = pname; rev = version; - sha256 = "sha256-pkJRJeEbBbAR1STb6v3Zu11twvHkAKAO0YjifRBFTDw="; + sha256 = "sha256-Z2rOaiNGvVDbRwf5XfoNIcenQdrE3fxHnfzyi6Ki2Ic="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 093ca1ffe9025..acbf1c270ffa0 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -4,14 +4,14 @@ buildDunePackage rec { pname = "xenstore"; - version = "2.2.0"; + version = "2.3.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; - hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; + hash = "sha256-1jxrvLLTwpd2fYPAoPbdRs7P1OaR8c9cW2VURF7Bs/Q="; }; buildInputs = [ ppx_cstruct ]; diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index 621ac9de0b29f..b571de2b9b728 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -25,6 +25,6 @@ php.buildComposerProject (finalAttrs: { homepage = "https://phpinsights.com/"; license = lib.licenses.mit; mainProgram = "phpinsights"; - maintainers = with lib.maintainers; [ patka ]; + maintainers = with lib.maintainers; [ ]; }; }) diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix index ac728fa7e656a..5de50342b3ca7 100644 --- a/pkgs/development/python-modules/aioapns/default.nix +++ b/pkgs/development/python-modules/aioapns/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioapns"; - version = "3.2"; + version = "3.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QPayQogW97saMmaPUP5x0CiXd6Qptg/OROigi5ASNQg="; + hash = "sha256-lLlfrv9yHBHKqmSrs4y9NKMgGSGQQe+zVFWMht+MvGk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix index 046ed8c04ec5e..0f4488317ba87 100644 --- a/pkgs/development/python-modules/aiomealie/default.nix +++ b/pkgs/development/python-modules/aiomealie/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiomealie"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-mealie"; rev = "refs/tags/v${version}"; - hash = "sha256-I1CA/YD2pNvBijSQgF/R8v5DfR/xyh0t/HGGiVE5UbY="; + hash = "sha256-pchGl3bkbW2bOQenYoSb0NmDvJqsYYuHHd4oUA9aTFo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 2e3ee99d5ab3a..2d3c94b0f0f04 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aiowebostv"; rev = "refs/tags/v${version}"; - hash = "sha256-VUznW+rMCZF1LbrQmEaOgdcX3YCm6Tf7yWlB8KNrjxU="; + hash = "sha256-pjHm+oCwbiD2dtkl30yATIVP85R72xEk/cmA+a5b05c="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix new file mode 100644 index 0000000000000..aaa700ebeacd2 --- /dev/null +++ b/pkgs/development/python-modules/albucore/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + pythonRelaxDepsHook, + fetchFromGitHub, + setuptools, + pytestCheckHook, + numpy, + opencv4, + tomli, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "albucore"; + version = "0.0.11"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "albumentations-team"; + repo = "albucore"; + rev = "refs/tags/${version}"; + hash = "sha256-ahW1dRbAFfJQ0B0Nfb+Lco03Ymd/IL6hLGvVox3S8/c="; + }; + + pythonRemoveDeps = [ "opencv-python" ]; + + build-system = [ + setuptools + pythonRelaxDepsHook + ]; + + dependencies = [ + numpy + opencv4 + tomli + typing-extensions + ]; + + pythonImportsCheck = [ "albucore" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations"; + homepage = "https://github.com/albumentations-team/albucore"; + changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 9f296b76055d3..cf38790288698 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.46.0.0"; + version = "3.46.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-x1nG13RDJ5fZ3Eds7yYKcFQ3B+5YKxvMvXrAbXw4bSc="; + hash = "sha256-GcfHkK4TCHPA2K6ymXtpCwNUCCUq0vq98UjYGGwn588="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index e9eed2ac38e0e..097a850988832 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.33"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,12 +18,12 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-j07HH84cn2AA5DyMcM7sXiBubCjZP67RJXVcErMPyBk="; + hash = "sha256-2Oj/3tMDC5s4OouSarAJo3TCwBOCY3DYjAZk3TcV9CQ="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail " --cov=asteval --cov-report xml" "" + substituteInPlace pyproject.toml \ + --replace-fail "--cov=asteval --cov-report html" "" ''; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/base64io/default.nix b/pkgs/development/python-modules/base64io/default.nix index c5ba9c8361442..ab442ae90fa46 100644 --- a/pkgs/development/python-modules/base64io/default.nix +++ b/pkgs/development/python-modules/base64io/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "base64io"; - version = "1.0.3-unstable-2023-10-30"; + version = "1.0.3-unstable-2024-06-24"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "base64io-python"; - rev = "604817576e607d1f7f8af1ffa1530522fd4e4be2"; - hash = "sha256-RFl0iuyHdPf3VpBxH4m/N2yaKEBxkNMT1ldZP9VGGOk="; + rev = "f3dd88bf0db6eb412c55ff579f0aa9f39d970c41"; + hash = "sha256-znQlPlS+jzPiHNBvnDnZ8l1pZP6iuYqExDlPii4dJwM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index d3e3a36ff885e..df2038a8e96c8 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-sensor-state-data"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-sensor-state-data"; rev = "refs/tags/v${version}"; - hash = "sha256-phiK+2tULBE78d1X/TsaT2kLRHxiCiuLMkaI7S6tqJ8="; + hash = "sha256-Gsg6Gbb+nvrKr7vn9zUuPTPtSjqFJyMk7oLt7LUUn5A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index aed55270adfed..6ccf61312811c 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.134"; + version = "1.34.138"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-KtCBgH1xCgzVP4ZkgN5225+Y9K1xBtlHr/sOivPIjrw="; + hash = "sha256-NHpxTfySZT/dDY7ZgByCoBxRBTyPoOQLy4gLOd6NBr0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index c593c5dbb3645..f3b436618cfd2 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.134"; + version = "1.34.138"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-48CK8m0HEc7vNWzSVKDYdy95S4zZ2o+eujLk8EYMRvg="; + hash = "sha256-YiRtRxlej8GTmtVK0Rb9CjMLvSULPf9vmL1J2iWgK8A="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/bundlewrap-keepass/default.nix b/pkgs/development/python-modules/bundlewrap-keepass/default.nix index 7a51ef2e84cc2..a738b0aa9e75f 100644 --- a/pkgs/development/python-modules/bundlewrap-keepass/default.nix +++ b/pkgs/development/python-modules/bundlewrap-keepass/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/bundlewrap-keepass"; description = "Use secrets from keepass in your BundleWrap repo"; license = licenses.gpl3; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-pass/default.nix b/pkgs/development/python-modules/bundlewrap-pass/default.nix index 1a6101c10a725..c4b58575700da 100644 --- a/pkgs/development/python-modules/bundlewrap-pass/default.nix +++ b/pkgs/development/python-modules/bundlewrap-pass/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/bundlewrap-pass"; description = "Use secrets from pass in your BundleWrap repo"; license = licenses.gpl3; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix index 588bcd7e5a3ab..a8dd57f15b788 100644 --- a/pkgs/development/python-modules/bundlewrap-teamvault/default.nix +++ b/pkgs/development/python-modules/bundlewrap-teamvault/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/trehn/bundlewrap-teamvault"; description = "Pull secrets from TeamVault into your BundleWrap repo"; license = [ licenses.gpl3 ]; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index c77d8bfe7af12..dcafcf1408483 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bundlewrap"; - version = "4.18.0"; + version = "4.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bundlewrap"; repo = "bundlewrap"; rev = "refs/tags/${version}"; - hash = "sha256-7jBFeJem+0vZot+BknKmCxozmoHCBCAZqDbfQQG3/Vw="; + hash = "sha256-sNdtJRpP54xlkYis4whoGiJJ/Tjnrs4TW6EO3eAMBAo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index a4f745f63caae..91e9c603e13be 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "correctionlib"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "cms-nanoAOD"; repo = "correctionlib"; rev = "refs/tags/v${version}"; - hash = "sha256-RI0wL+/6aNCV9PZMY9ZLNFLVYPm9kAyxcvLzLLM/T3Y="; + hash = "sha256-mfNSETMjhLoa3MK7zPggz568j1T6ay42cKa1GGKKfT8="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 2388e215d929e..6311a7d099e79 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -21,9 +21,8 @@ let name = "cudatoolkit-joined-${cudaPackages.cudaVersion}"; paths = with cudaPackages; [ cuda_cccl # <nv/target> - cuda_cccl.dev cuda_cudart - cuda_nvcc.dev # <crt/host_defines.h> + cuda_nvcc # <crt/host_defines.h> cuda_nvprof cuda_nvrtc cuda_nvtx diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 56ecdd68354e8..6475208e3a40b 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.7.1"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-JnSWKQFPrD8wadgz/4Ulisy6Mjc264JHX3PMOX+msac="; + hash = "sha256-ZJMyshGN7DjAESEZA2NBDtIOkyem2H7TSQ4Uwcea0LQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix index c804f94bc1b99..f49197cc90fcd 100644 --- a/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/pkgs/development/python-modules/dbus-deviation/default.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://tecnocode.co.uk/dbus-deviation/"; description = "Project for parsing D-Bus introspection XML and processing it in various ways"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix new file mode 100644 index 0000000000000..cc866d2de393b --- /dev/null +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchPypi +, rustPlatform +, pyarrow +, pyarrow-hotfix +, openssl +, pkg-config +, pytestCheckHook +, pytest-benchmark +, pytest-cov +, pandas +}: + +buildPythonPackage rec { + pname = "deltalake"; + version = "0.18.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qkmCKk1VnROK7luuPlKbIx3S3C8fzGJy8yhTyZWXyGc="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-Dj2vm0l4b/E6tbXgs5iPvbDAsxNW0iPUSRPzT5KaA3Y="; + }; + + env.OPENSSL_NO_VENDOR = 1; + + dependencies = [ + pyarrow + pyarrow-hotfix + ]; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ + pkg-config # openssl-sys needs this + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); + + pythonImportsCheck = [ "deltalake" ]; + + nativeCheckInputs = [ + pytestCheckHook + pandas + pytest-benchmark + pytest-cov + ]; + + preCheck = '' + # For paths in test to work, we have to be in python dir + cp pyproject.toml python/ + cd python + + # In tests we want to use deltalake that we have built + rm -rf deltalake + ''; + + pytestFlagsArray = [ "-m 'not integration'" ]; + + meta = with lib; { + description = "Native Rust library for Delta Lake, with bindings into Python"; + homepage = "https://github.com/delta-io/delta-rs"; + changelog = "https://github.com/delta-io/delta-rs/blob/python-v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ kfollesdal mslingsby harvidsen andershus ]; + }; +} diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 6a414f9cabb9b..9b9eeb9cc89c5 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -26,16 +26,16 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.7"; + version = "4.8.8"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-UEj3WXRBaEOMX+wIDUjE6AP30QSSBUJHzNh3Kp/2AkE="; + hash = "sha256-j+If/yYj85c8GpSo/fq5MfxVHQlo/4+Qh+Bn1N/9nd4="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index ff1ef2e64b420..6330d06537950 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "9.0.0"; + version = "9.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-HchR0/PzIMBI0DYY5MDZhh+koVBrQl0tCaVksgyVZ0o="; + hash = "sha256-xsn38erNkBnRGMr7dZCERcqkGnn2Xzb59QbJYm28vHA="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 086987f4dabcf..cf818ce7581ee 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "django-compressor"; - version = "4.4"; + version = "4.5"; pyproject = true; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; + hash = "sha256-nZjJBbdBvmywmtgowdIqn/kkTdCII+KSavjd0YccPGU="; }; build-system = [ diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 8ca641ad75e5d..6d29cacb8c540 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -6,10 +6,10 @@ nix-update-script, # build-system - gettext, + flit-gettext, + flit-scm, nodejs, npmHooks, - setuptools-scm, # dependencies django, @@ -21,58 +21,52 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.5"; - format = "setuptools"; + version = "3.5.4"; + pyproject = true; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-FXh5OFMTjsKgjEeIS+CiOwyGOs4AisJA+g49rCILDsQ="; + hash = "sha256-d8rKn4Hab7y/e/VLhVfr3A3TUhoDtjP7RhCj+o6IbyE="; }; postPatch = '' - substituteInPlace setup.py \ - --replace 'cmd = ["npm", "ci"]' 'cmd = ["true"]' \ - --replace 'f"{self.build_lib}/{name}.mo"' 'f"{name}.mo"' + sed -i "/addopts/d" pyproject.toml - sed -i "/addopts/d" setup.cfg + # missing integrity hashes for yocto-queue, yargs-parser + cp ${./package-lock.json} package-lock.json ''; npmDeps = fetchNpmDeps { - inherit src; - hash = "sha256-cZEr/7FW4vCR8gpraT+/rPwYK9Xn22b5WH7lnuK5L4U="; + inherit src postPatch; + hash = "sha256-npAFpdqGdttE4facBimS/y2SqwnCvOHJhd60SPR/IaA="; }; - nativeBuildInputs = [ - gettext + build-system = [ + flit-gettext + flit-scm nodejs npmHooks.npmConfigHook - setuptools-scm ]; - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; nativeCheckInputs = [ pytestCheckHook pytest-django ]; - env.DJANGO_SETTINGS_MODULE = "hijack.tests.test_app.settings"; - - pytestFlagsArray = [ - "--pyargs" - "hijack" - "-W" - "ignore::DeprecationWarning" - ]; + preCheck = '' + export DJANGO_SETTINGS_MODULE=hijack.tests.test_app.settings + ''; # needed for npmDeps update passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; - homepage = "https://github.com/arteria/django-hijack"; + homepage = "https://github.com/django-hijack/django-hijack"; changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/django-hijack/package-lock.json b/pkgs/development/python-modules/django-hijack/package-lock.json new file mode 100644 index 0000000000000..74de400e4d82d --- /dev/null +++ b/pkgs/development/python-modules/django-hijack/package-lock.json @@ -0,0 +1,7875 @@ +{ + "name": "django-hijack", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "django-hijack", + "version": "1.0.0", + "license": "MIT", + "devDependencies": { + "jest": "*", + "jest-environment-jsdom": "*", + "standard": "*", + "stylelint": "*", + "stylelint-config-standard-scss": "*", + "stylelint-scss": "*" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz", + "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz", + "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-compilation-targets": "^7.24.7", + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helpers": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/template": "^7.24.7", + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/generator": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz", + "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", + "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.24.7", + "@babel/helper-validator-option": "^7.24.7", + "browserslist": "^4.22.2", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", + "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", + "dev": true, + "dependencies": { + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", + "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", + "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz", + "integrity": "sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", + "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", + "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz", + "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", + "dev": true, + "dependencies": { + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/parser": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz", + "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz", + "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz", + "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", + "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz", + "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz", + "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.0.tgz", + "integrity": "sha512-qvBMcOU/uWFCH/VO0MYe0AMs0BGMWAt6FTryMbFIKYtZtVnqTZtT8ktv5o718llkaGZWomJezJZjq3vJDHeJNQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^2.3.2" + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.3.2.tgz", + "integrity": "sha512-0xYOf4pQpAaE6Sm2Q0x3p25oRukzWQ/O8hWVvhIt9Iv98/uu053u2CGm/g3kJ+P0vOYTAYzoU8Evq2pg9ZPXtw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + } + }, + "node_modules/@csstools/media-query-list-parser": { + "version": "2.1.12", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.12.tgz", + "integrity": "sha512-t1/CdyVJzOQUiGUcIBXRzTAkWTFPxiPnoKwowKW2z9Uj78c2bBWI/X94BeVfUwVq1xtCjD7dnO8kS6WONgp8Jw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^2.7.0", + "@csstools/css-tokenizer": "^2.3.2" + } + }, + "node_modules/@csstools/selector-specificity": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz", + "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "engines": { + "node": "^14 || ^16 || >=18" + }, + "peerDependencies": { + "postcss-selector-parser": "^6.0.13" + } + }, + "node_modules/@dual-bundle/import-meta-resolve": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", + "integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/core": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", + "dev": true, + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/environment": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", + "dev": true, + "dependencies": { + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", + "dev": true, + "dependencies": { + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.6.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/fake-timers": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", + "@types/node": "*", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/globals": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", + "dev": true, + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^6.0.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "slash": "^3.0.0", + "string-length": "^4.0.1", + "strip-ansi": "^6.0.0", + "v8-to-istanbul": "^9.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/source-map": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.18", + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-result": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", + "dev": true, + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", + "dev": true, + "dependencies": { + "@jest/test-result": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "write-file-atomic": "^4.0.2" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true + }, + "node_modules/@sinonjs/commons": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", + "dev": true, + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "dev": true, + "dependencies": { + "@sinonjs/commons": "^3.0.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz", + "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.20.7" + } + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jsdom": { + "version": "20.0.1", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz", + "integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/tough-cookie": "*", + "parse5": "^7.0.0" + } + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, + "node_modules/@types/node": { + "version": "20.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", + "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } + }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true + }, + "node_modules/@types/tough-cookie": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", + "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", + "dev": true + }, + "node_modules/@types/yargs": { + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", + "dev": true + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead", + "dev": true + }, + "node_modules/acorn": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", + "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz", + "integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==", + "dev": true, + "dependencies": { + "acorn": "^8.1.0", + "acorn-walk": "^8.0.2" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz", + "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==", + "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", + "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.toreversed": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/babel-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", + "dev": true, + "dependencies": { + "@jest/transform": "^29.7.0", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^29.6.3", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", + "dev": true, + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.1.14", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "dev": true, + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-preset-jest": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", + "dev": true, + "dependencies": { + "babel-plugin-jest-hoist": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browserslist": { + "version": "4.23.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz", + "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001629", + "electron-to-chromium": "^1.4.796", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.16" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/builtins": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", + "dev": true, + "dependencies": { + "semver": "^7.0.0" + } + }, + "node_modules/builtins/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001639", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001639.tgz", + "integrity": "sha512-eFHflNTBIlFwP2AIKaYuBQN/apnUoKNhBdza8ZnW/h2di4LCZ4xFqYlxUxo+LQ76KFI1PGcC1QDxMbxTZpSCAg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/cjs-module-lexer": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", + "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==", + "dev": true + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==", + "dev": true + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/colord": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/cosmiconfig": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", + "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", + "dev": true, + "dependencies": { + "env-paths": "^2.2.1", + "import-fresh": "^3.3.0", + "js-yaml": "^4.1.0", + "parse-json": "^5.2.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/cosmiconfig/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/cosmiconfig/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/css-functions-list": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.2.tgz", + "integrity": "sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==", + "dev": true, + "engines": { + "node": ">=12 || >=16" + } + }, + "node_modules/css-tree": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", + "dev": true, + "dependencies": { + "mdn-data": "2.0.30", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/cssom": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", + "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==", + "dev": true + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dev": true, + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "node_modules/data-urls": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz", + "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.6", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/debug": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", + "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true + }, + "node_modules/dedent": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz", + "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/domexception": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", + "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", + "deprecated": "Use your platform's native DOMException instead", + "dev": true, + "dependencies": { + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.815", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", + "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==", + "dev": true + }, + "node_modules/emittery": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.3", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.13", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.1", + "object-keys": "^1.1.1", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.15" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", + "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "dev": true, + "dependencies": { + "hasown": "^2.0.0" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/eslint": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", + "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.1", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0 || ^16.0.0 ", + "eslint-plugin-promise": "^6.0.0" + } + }, + "node_modules/eslint-config-standard-jsx": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz", + "integrity": "sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "peerDependencies": { + "eslint": "^8.8.0", + "eslint-plugin-react": "^7.28.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", + "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", + "dev": true, + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-es": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", + "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", + "dev": true, + "dependencies": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=4.19.1" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-n": { + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", + "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", + "dev": true, + "dependencies": { + "builtins": "^5.0.1", + "eslint-plugin-es": "^4.1.0", + "eslint-utils": "^3.0.0", + "ignore": "^5.1.1", + "is-core-module": "^2.11.0", + "minimatch": "^3.1.2", + "resolve": "^1.22.1", + "semver": "^7.3.8" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-plugin-n/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz", + "integrity": "sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.34.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz", + "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.2", + "array.prototype.toreversed": "^1.1.2", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.19", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.8", + "object.fromentries": "^2.0.8", + "object.hasown": "^1.1.4", + "object.values": "^1.2.0", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.11" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "dependencies": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "engines": { + "node": ">= 4.9.1" + } + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stdin": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", + "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/global-modules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dev": true, + "dependencies": { + "global-prefix": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "dependencies": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globjoin": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", + "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", + "dev": true + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", + "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "node_modules/html-tags": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", + "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dev": true, + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true + }, + "node_modules/internal-slot": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", + "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", + "dev": true, + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, + "dependencies": { + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dev": true, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } + }, + "node_modules/jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", + "dev": true, + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", + "import-local": "^3.0.2", + "jest-cli": "^29.7.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", + "dev": true, + "dependencies": { + "execa": "^5.0.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-circus": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^1.0.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "p-limit": "^3.1.0", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-cli": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", + "dev": true, + "dependencies": { + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "create-jest": "^29.7.0", + "exit": "^0.1.2", + "import-local": "^3.0.2", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "yargs": "^17.3.1" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-config": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "@types/node": "*", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-docblock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", + "dev": true, + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-each": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-environment-jsdom": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz", + "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/jsdom": "^20.0.0", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0", + "jsdom": "^20.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jest-environment-node": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/graceful-fs": "^4.1.3", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", + "micromatch": "^4.0.4", + "walker": "^1.0.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-leak-detector": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", + "dev": true, + "dependencies": { + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-mock": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", + "dev": true, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "resolve": "^1.20.0", + "resolve.exports": "^2.0.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", + "dev": true, + "dependencies": { + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runner": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", + "dev": true, + "dependencies": { + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", + "p-limit": "^3.1.0", + "source-map-support": "0.5.13" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-runtime": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", + "dev": true, + "dependencies": { + "@babel/core": "^7.11.6", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/types": "^7.3.3", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^29.7.0", + "graceful-fs": "^4.2.9", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "natural-compare": "^1.4.0", + "pretty-format": "^29.7.0", + "semver": "^7.5.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^29.6.3", + "leven": "^3.1.0", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-validate/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watcher": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", + "dev": true, + "dependencies": { + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", + "dev": true, + "dependencies": { + "@types/node": "*", + "jest-util": "^29.7.0", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsdom": { + "version": "20.0.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz", + "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.6", + "acorn": "^8.8.1", + "acorn-globals": "^7.0.0", + "cssom": "^0.5.0", + "cssstyle": "^2.3.0", + "data-urls": "^3.0.2", + "decimal.js": "^10.4.2", + "domexception": "^4.0.0", + "escodegen": "^2.0.0", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^3.0.0", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.1", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.2", + "parse5": "^7.1.1", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.1.2", + "w3c-xmlserializer": "^4.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0", + "whatwg-url": "^11.0.0", + "ws": "^8.11.0", + "xml-name-validator": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/known-css-properties": { + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.31.0.tgz", + "integrity": "sha512-sBPIUGTNF0czz0mwGGUoKKJC8Q7On1GPbCSFPfyEsfHb2DyBG0Y4QtV+EVWpINSaiGKZblDNuF5AezxSgOhesQ==", + "dev": true + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true + }, + "node_modules/load-json-file": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", + "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.15", + "parse-json": "^4.0.0", + "pify": "^4.0.1", + "strip-bom": "^3.0.0", + "type-fest": "^0.3.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/load-json-file/node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "dev": true, + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/load-json-file/node_modules/type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dev": true, + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/mathml-tag-names": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", + "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/mdn-data": { + "version": "2.0.30", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", + "dev": true + }, + "node_modules/meow": { + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz", + "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "dev": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node_modules/node-releases": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nwsapi": { + "version": "2.2.10", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz", + "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==", + "dev": true + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.hasown": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", + "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", + "dev": true, + "dependencies": { + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.values": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-locate/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse5": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", + "dev": true, + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-conf": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", + "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0", + "load-json-file": "^5.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-conf/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-conf/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/postcss": { + "version": "8.4.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", + "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.0.1", + "source-map-js": "^1.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true + }, + "node_modules/postcss-resolve-nested-selector": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", + "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==", + "dev": true + }, + "node_modules/postcss-safe-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.0.tgz", + "integrity": "sha512-ovehqRNVCpuFzbXoTb4qLtyzK3xn3t/CUBxOs8LsnQjQrShaB4lKiHoVqY8ANaC0hBMHq5QVWk77rwGklFUDrg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-safe-parser" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "engines": { + "node": ">=18.0" + }, + "peerDependencies": { + "postcss": "^8.4.31" + } + }, + "node_modules/postcss-scss": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz", + "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss-scss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "engines": { + "node": ">=12.0" + }, + "peerDependencies": { + "postcss": "^8.4.29" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz", + "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==", + "dev": true, + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/prop-types/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pure-rand": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.1.0.tgz", + "integrity": "sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", + "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve.exports": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-regex-test": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-regex": "^1.1.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "dev": true, + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=v12.22.7" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/standard": { + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/standard/-/standard-17.1.0.tgz", + "integrity": "sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "eslint": "^8.41.0", + "eslint-config-standard": "17.1.0", + "eslint-config-standard-jsx": "^11.0.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-n": "^15.7.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-react": "^7.32.2", + "standard-engine": "^15.0.0", + "version-guard": "^1.1.1" + }, + "bin": { + "standard": "bin/cmd.cjs" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/standard-engine": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/standard-engine/-/standard-engine-15.1.0.tgz", + "integrity": "sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "get-stdin": "^8.0.0", + "minimist": "^1.2.6", + "pkg-conf": "^3.1.0", + "xdg-basedir": "^4.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dev": true, + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stylelint": { + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.6.1.tgz", + "integrity": "sha512-yNgz2PqWLkhH2hw6X9AweV9YvoafbAD5ZsFdKN9BvSDVwGvPh+AUIrn7lYwy1S7IHmtFin75LLfX1m0D2tHu8Q==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + }, + { + "type": "github", + "url": "https://github.com/sponsors/stylelint" + } + ], + "dependencies": { + "@csstools/css-parser-algorithms": "^2.6.3", + "@csstools/css-tokenizer": "^2.3.1", + "@csstools/media-query-list-parser": "^2.1.11", + "@csstools/selector-specificity": "^3.1.1", + "@dual-bundle/import-meta-resolve": "^4.1.0", + "balanced-match": "^2.0.0", + "colord": "^2.9.3", + "cosmiconfig": "^9.0.0", + "css-functions-list": "^3.2.2", + "css-tree": "^2.3.1", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "fastest-levenshtein": "^1.0.16", + "file-entry-cache": "^9.0.0", + "global-modules": "^2.0.0", + "globby": "^11.1.0", + "globjoin": "^0.1.4", + "html-tags": "^3.3.1", + "ignore": "^5.3.1", + "imurmurhash": "^0.1.4", + "is-plain-object": "^5.0.0", + "known-css-properties": "^0.31.0", + "mathml-tag-names": "^2.1.3", + "meow": "^13.2.0", + "micromatch": "^4.0.7", + "normalize-path": "^3.0.0", + "picocolors": "^1.0.1", + "postcss": "^8.4.38", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-safe-parser": "^7.0.0", + "postcss-selector-parser": "^6.1.0", + "postcss-value-parser": "^4.2.0", + "resolve-from": "^5.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^7.1.0", + "supports-hyperlinks": "^3.0.0", + "svg-tags": "^1.0.0", + "table": "^6.8.2", + "write-file-atomic": "^5.0.1" + }, + "bin": { + "stylelint": "bin/stylelint.mjs" + }, + "engines": { + "node": ">=18.12.0" + } + }, + "node_modules/stylelint-config-recommended": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz", + "integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + }, + { + "type": "github", + "url": "https://github.com/sponsors/stylelint" + } + ], + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "stylelint": "^16.1.0" + } + }, + "node_modules/stylelint-config-recommended-scss": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-14.0.0.tgz", + "integrity": "sha512-HDvpoOAQ1RpF+sPbDOT2Q2/YrBDEJDnUymmVmZ7mMCeNiFSdhRdyGEimBkz06wsN+HaFwUh249gDR+I9JR7Onw==", + "dev": true, + "dependencies": { + "postcss-scss": "^4.0.9", + "stylelint-config-recommended": "^14.0.0", + "stylelint-scss": "^6.0.0" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "postcss": "^8.3.3", + "stylelint": "^16.0.2" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + } + } + }, + "node_modules/stylelint-config-standard": { + "version": "36.0.1", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-36.0.1.tgz", + "integrity": "sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + }, + { + "type": "github", + "url": "https://github.com/sponsors/stylelint" + } + ], + "dependencies": { + "stylelint-config-recommended": "^14.0.1" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "stylelint": "^16.1.0" + } + }, + "node_modules/stylelint-config-standard-scss": { + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-13.1.0.tgz", + "integrity": "sha512-Eo5w7/XvwGHWkeGLtdm2FZLOMYoZl1omP2/jgFCXyl2x5yNz7/8vv4Tj6slHvMSSUNTaGoam/GAZ0ZhukvalfA==", + "dev": true, + "dependencies": { + "stylelint-config-recommended-scss": "^14.0.0", + "stylelint-config-standard": "^36.0.0" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "postcss": "^8.3.3", + "stylelint": "^16.3.1" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + } + } + }, + "node_modules/stylelint-scss": { + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.3.2.tgz", + "integrity": "sha512-pNk9mXOVKkQtd+SROPC9io8ISSgX+tOVPhFdBE+LaKQnJMLdWPbGKAGYv4Wmf/RrnOjkutunNTN9kKMhkdE5qA==", + "dev": true, + "dependencies": { + "known-css-properties": "^0.31.0", + "postcss-media-query-parser": "^0.2.3", + "postcss-resolve-nested-selector": "^0.1.1", + "postcss-selector-parser": "^6.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": ">=18.12.0" + }, + "peerDependencies": { + "stylelint": "^16.0.2" + } + }, + "node_modules/stylelint/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/stylelint/node_modules/balanced-match": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", + "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", + "dev": true + }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz", + "integrity": "sha512-6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==", + "dev": true, + "dependencies": { + "flat-cache": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/stylelint/node_modules/flat-cache": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz", + "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==", + "dev": true, + "dependencies": { + "flatted": "^3.3.1", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/stylelint/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/stylelint/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/stylelint/node_modules/write-file-atomic": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", + "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz", + "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=14.18" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svg-tags": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", + "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", + "dev": true + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, + "node_modules/table": { + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", + "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", + "dev": true, + "dependencies": { + "ajv": "^8.0.1", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/table/node_modules/ajv": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", + "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.4.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/table/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tough-cookie": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", + "dev": true, + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dev": true, + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", + "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true + }, + "node_modules/v8-to-istanbul": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", + "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==", + "dev": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/version-guard": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.2.tgz", + "integrity": "sha512-D8d+YxCUpoqtCnQzDxm6SF7DLU3gr2535T4khAtMq4osBahsQnmSxuwXFdrbAdDGG8Uokzfis/jvyeFPdmlc7w==", + "dev": true, + "engines": { + "node": ">=0.10.48" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", + "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", + "dev": true, + "dependencies": { + "xml-name-validator": "^4.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "dev": true, + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-mimetype": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", + "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dev": true, + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dev": true, + "dependencies": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.7" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + } + }, + "node_modules/ws": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xdg-basedir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", + "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/xml-name-validator": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", + "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index f39a195844402..7dd2ee7fe2106 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/makinacorpus/django-leaflet"; changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-mysql/default.nix b/pkgs/development/python-modules/django-mysql/default.nix deleted file mode 100644 index 9cb828f9b247b..0000000000000 --- a/pkgs/development/python-modules/django-mysql/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - - # dependencies - django, - - # tests - pytest-django, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "django-mysql"; - version = "4.13.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "adamchainz"; - repo = "django-mysql"; - rev = "refs/tags/${version}"; - hash = "sha256-hIvkLLv9R23u+JC6t/zwbMvmgLMstYp0ytuSqNiohJg="; - }; - - build-system = [ setuptools ]; - - dependencies = [ django ]; - - doCheck = false; # requires mysql/mariadb server - - env.DJANGO_SETTINGS_MODULE = "tests.settings"; - - nativeCheckInputs = [ - pytest-django - pytestCheckHook - ]; - - pythonImportsCheck = [ "django_mysql" ]; - - meta = with lib; { - changelog = "https://github.com/adamchainz/django-mysql/blob/${version}/docs/changelog.rst"; - description = "Extensions to Django for use with MySQL/MariaD"; - homepage = "https://github.com/adamchainz/django-mysql"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index 1940c43ed06df..8b74363689d07 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -74,6 +74,6 @@ buildPythonPackage rec { description = "Speech recognition framework allowing powerful Python-based scripting"; homepage = "https://github.com/dictation-toolbox/dragonfly"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/dtlssocket/default.nix b/pkgs/development/python-modules/dtlssocket/default.nix index 589785da7bc37..2d8e3988bee10 100644 --- a/pkgs/development/python-modules/dtlssocket/default.nix +++ b/pkgs/development/python-modules/dtlssocket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "dtlssocket"; - version = "0.1.18"; + version = "0.1.19"; format = "pyproject"; src = fetchPypi { pname = "DTLSSocket"; inherit version; - hash = "sha256-TnS2LYe6CeAlezc83bGpRqOpQbPJMQHzJn6PnXon4FI="; + hash = "sha256-hKwWkQ/K+FTgn2Gs8Pynz/ihuVeO8grqekPPbGK5eDI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 5b13f55ebed96..32c0d20b6beb9 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -6,11 +6,9 @@ pythonOlder, duckdb, hypothesis, - ipython-sql, pandas, poetry-core, pytest-remotedata, - snapshottest, sqlalchemy, typing-extensions, }: @@ -40,19 +38,12 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; - disabledTests = [ - # test should be skipped based on sqlalchemy version but isn't and fails - "test_commit" - ]; - nativeCheckInputs = [ pytestCheckHook ]; checkInputs = [ hypothesis - ipython-sql pandas pytest-remotedata - snapshottest typing-extensions ]; diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index 63187c72342c3..ce592806ceeb3 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.20.0"; - format = "pyproject"; + version = "0.21.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvc-studio-client"; rev = "refs/tags/${version}"; - hash = "sha256-JLrsbgifoUnN1Mwml9tO3/SkA6miE14AGjxrFwEcRks="; + hash = "sha256-SCRMBZKOt8JtDi5aGgk6TCxetvG3QU1jOv6U5/6ChTE="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dulwich gitpython requests diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 1be006d1c05bd..c53e939a66b6d 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.7"; + version = "0.21.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-BWA0Irf6OpUGX/NkHMuxQ45QUr3PRdWLSEs9Bavk8RM="; + hash = "sha256-ffKteff4Xsg9kxJukVlSnwmKowRN35bMfDJo/9mV6s8="; }; build-system = [ diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix index a5ebbbf936785..262691535d502 100644 --- a/pkgs/development/python-modules/energyzero/default.nix +++ b/pkgs/development/python-modules/energyzero/default.nix @@ -9,13 +9,14 @@ pytest-freezer, pytestCheckHook, pythonOlder, + syrupy, yarl, }: buildPythonPackage rec { pname = "energyzero"; - version = "2.1.0"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; disabled = pythonOlder "3.11"; @@ -23,16 +24,16 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-energyzero"; rev = "refs/tags/v${version}"; - hash = "sha256-NZbCiLCZC+hTcV0twOeCoKKD3eZ0/ZzPTnVpFyMLSfw="; + hash = "sha256-KOeYdTruD8AN/NkLEKKJDUB/JkOoQwfAMZkp/RvvUQE="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" + --replace-fail '"0.0.0"' '"${version}"' \ + --replace-fail 'addopts = "--cov"' "" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; propagatedBuildInputs = [ aiohttp @@ -44,6 +45,7 @@ buildPythonPackage rec { pytest-asyncio pytest-freezer pytestCheckHook + syrupy ]; pythonImportsCheck = [ "energyzero" ]; diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index d89a041be864f..0e9cabdcf6563 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, hatchling, jax, jaxlib, @@ -28,9 +29,18 @@ buildPythonPackage rec { hash = "sha256-3OwHND1YEdg/SppqiB7pCdp6v+lYwTbtX07tmyEMWDo="; }; - nativeBuildInputs = [ hatchling ]; + patches = [ + # TODO: remove when next release (0.11.5) is out + (fetchpatch { + name = "make-tests-pass-with-jaxtyping-0-2-30"; + url = "https://github.com/patrick-kidger/equinox/commit/cf942646cddffd32519d876c653d09e064bd66b8.patch"; + hash = "sha256-q/vbvLhqT4q+BK+q5sPVY5arzXCmH5LWxt4evAwywtM="; + }) + ]; + + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ jax jaxlib jaxtyping @@ -64,11 +74,11 @@ buildPythonPackage rec { "test_backward_nan" ]; - meta = with lib; { + meta = { description = "JAX library based around a simple idea: represent parameterised functions (such as neural networks) as PyTrees"; changelog = "https://github.com/patrick-kidger/equinox/releases/tag/v${version}"; homepage = "https://github.com/patrick-kidger/equinox"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/faster-fifo/default.nix b/pkgs/development/python-modules/faster-fifo/default.nix deleted file mode 100644 index 1b6d4a0ce90d2..0000000000000 --- a/pkgs/development/python-modules/faster-fifo/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - cython, - setuptools, - - # tests - numpy, - unittestCheckHook, -}: - -buildPythonPackage rec { - pname = "faster-fifo"; - version = "1.4.6"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "alex-petrenko"; - repo = "faster-fifo"; - rev = "v${version}"; - hash = "sha256-vgaaIJTtNg2XqEZ9TB7tTMPJ9yMyWjtfdgNU/lcNLcg="; - }; - - nativeBuildInputs = [ - cython - setuptools - ]; - - pythonImportsCheck = [ "faster_fifo" ]; - - nativeCheckInputs = [ - numpy - unittestCheckHook - ]; - - meta = with lib; { - description = "Faster alternative to Python's multiprocessing.Queue (IPC FIFO queue"; - homepage = "https://github.com/alex-petrenko/faster-fifo"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - }; -} diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index f36b90cbb3ff6..9c02e6beee367 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "SYSTRAN"; repo = "faster-whisper"; rev = "refs/tags/v${version}"; - hash = "sha256-O2RRwb+omgSpfckHh3oPu454g2ULT4gyolrg5olHcRc="; + hash = "sha256-C/O+wt3dykQJmH+VsVkpQwEAdyW8goMUMKR0Z3Y7jdo="; }; build-system = [ diff --git a/pkgs/development/python-modules/flit-gettext/default.nix b/pkgs/development/python-modules/flit-gettext/default.nix new file mode 100644 index 0000000000000..311861da7f711 --- /dev/null +++ b/pkgs/development/python-modules/flit-gettext/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + substituteAll, + + # build-system + flit-scm, + wheel, + + # dependencies + flit-core, + gettext, + + # tests + build, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "flit-gettext"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "codingjoe"; + repo = "flit-gettext"; + rev = version; + hash = "sha256-YsRfpciSrHmivEJKfzdp6UaPx2tSr3VdjU4ZIbYQX6c="; + }; + + patches = [ + (substituteAll { + src = ./msgfmt-path.patch; + msgfmt = lib.getExe' gettext "msgfmt"; + }) + ]; + + postPatch = '' + sed -i "s/--cov//" pyproject.toml + ''; + + nativeBuildInputs = [ + flit-scm + wheel + ]; + + propagatedBuildInputs = [ flit-core ]; + + optional-dependencies = { + scm = [ flit-scm ]; + }; + + nativeCheckInputs = [ + build + pytestCheckHook + wheel + ] ++ optional-dependencies.scm; + + disabledTests = [ + # tests for missing msgfmt, but we always provide it + "test_compile_gettext_translations__no_gettext" + ]; + + disabledTestPaths = [ + # calls python -m build, but can't find build + "tests/test_core.py" + "tests/test_scm.py" + ]; + + pythonImportsCheck = [ "flit_gettext" ]; + + meta = with lib; { + description = "Compiling gettext i18n messages during project bundling"; + homepage = "https://github.com/codingjoe/flit-gettext"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/flit-gettext/msgfmt-path.patch b/pkgs/development/python-modules/flit-gettext/msgfmt-path.patch new file mode 100644 index 0000000000000..957eb513f7720 --- /dev/null +++ b/pkgs/development/python-modules/flit-gettext/msgfmt-path.patch @@ -0,0 +1,13 @@ +diff --git a/flit_gettext/utils.py b/flit_gettext/utils.py +index dd1b135..1c8877c 100644 +--- a/flit_gettext/utils.py ++++ b/flit_gettext/utils.py +@@ -7,7 +7,7 @@ def compile_gettext_translations(config): + """Compile gettext translations.""" + print("\33[1m* Compiling gettext translations...\33[0m") + +- msgfmt = shutil.which("msgfmt") ++ msgfmt = shutil.which("msgfmt") or "@msgfmt@" + + if msgfmt is None: + raise OSError("msgfmt not found, please install gettext or check your PATH.") diff --git a/pkgs/development/python-modules/freertos-gdb/default.nix b/pkgs/development/python-modules/freertos-gdb/default.nix index cb240cec4807e..7535ba80d35c6 100644 --- a/pkgs/development/python-modules/freertos-gdb/default.nix +++ b/pkgs/development/python-modules/freertos-gdb/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "freertos-gdb"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o0ZoTy7OLVnrhSepya+MwaILgJSojs2hfmI86D9C3cs="; + sha256 = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; }; # Project has no tests diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 89140e97a432e..7bf6d5a6d2a72 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.18.19"; + version = "0.18.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = "frigidaire"; rev = "refs/tags/${version}"; - hash = "sha256-wbYijFiMk+EIAjD6+mKt/c6JwN9oQLfeL1Pk30RbKKs="; + hash = "sha256-7fpVFKhLXBD0ec2mGfbFHygaH8BtOIOd5NoYz03IKp8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index a52c326146577..2ca4ab01e716a 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -12,6 +12,7 @@ # tests pytestCheckHook, + versionCheckHook, }: buildPythonPackage rec { @@ -30,7 +31,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + versionCheckHook + pytestCheckHook + ]; preCheck = '' export PATH=$out/bin:$PATH diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix index 5f0976661fcc8..53c56b2d7b69d 100644 --- a/pkgs/development/python-modules/gflanguages/default.nix +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mlRNzrAgeEt1/VbQEXWIxCD9NkULMOnkFsALO5H+1SY="; + hash = "sha256-v93mXDwHT/8Tau78ApLUR+dQCpL9jmRQp0BT5y/sfq4="; }; pyproject = true; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 1ee6497fd1817..10fb6837f5eea 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.5"; + version = "0.6.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xAicJ3+k4mci92qwPuMDnyi+i/HJvigpSLlYOhVMbXk="; + hash = "sha256-FznwNcru7KXCj4h0Be7IaQ8zctr3n+zyZFSpek8XM6g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 1a6ef5e6c9cff..c31e4c81359f3 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.133.0"; + version = "2.135.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KTCSkFtmoEbTGHqZrEVOErAMwscERPJusvH5wagnILQ="; + hash = "sha256-tVKigSPtlUkwNWmNuA6O14yRBqi0IuY6F1FQubVbcE4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gpt-2-simple/default.nix b/pkgs/development/python-modules/gpt-2-simple/default.nix index d8561bf346e97..e2908da74f70a 100644 --- a/pkgs/development/python-modules/gpt-2-simple/default.nix +++ b/pkgs/development/python-modules/gpt-2-simple/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Easily retrain OpenAI's GPT-2 text-generating model on new texts"; homepage = "https://github.com/minimaxir/gpt-2-simple"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gsm0338/default.nix b/pkgs/development/python-modules/gsm0338/default.nix index 4f6326ec9ca56..e6153f48a58fc 100644 --- a/pkgs/development/python-modules/gsm0338/default.nix +++ b/pkgs/development/python-modules/gsm0338/default.nix @@ -28,9 +28,6 @@ buildPythonPackage { description = "Python codec for GSM 03.38"; homepage = "https://github.com/dsch/gsm0338"; license = licenses.mit; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index f2cc5a2edfac1..ccb4c30f24d4a 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -63,6 +63,6 @@ buildPythonPackage rec { homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/here-routing/default.nix b/pkgs/development/python-modules/here-routing/default.nix index 0ab74bcd2bb64..d8e6e4a3c8009 100644 --- a/pkgs/development/python-modules/here-routing/default.nix +++ b/pkgs/development/python-modules/here-routing/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, aiohttp, async-timeout, yarl, @@ -14,26 +14,26 @@ buildPythonPackage rec { pname = "here-routing"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.10"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "here_routing"; rev = "v${version}"; - hash = "sha256-wdjPbM9J+2q3NisdlOHIddSWHHIfwQY/83v6IBAXSq0="; + hash = "sha256-sdNs5QNYvL1Cpbk9Yi+7PSiDZ6LEgAXQ19IYSAY78p0="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout yarl @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "here_routing" ]; meta = { - changelog = "https://github.com/eifinger/here_routing/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/eifinger/here_routing/releases/tag/v${version}"; description = "Asynchronous Python client for the HERE Routing V8 API"; homepage = "https://github.com/eifinger/here_routing"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/here-transit/default.nix b/pkgs/development/python-modules/here-transit/default.nix index 8c9ef33e5715c..2aae9b51fe53d 100644 --- a/pkgs/development/python-modules/here-transit/default.nix +++ b/pkgs/development/python-modules/here-transit/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - poetry-core, + hatchling, aiohttp, async-timeout, yarl, @@ -14,26 +14,26 @@ buildPythonPackage rec { pname = "here-transit"; - version = "1.2.0"; + version = "1.2.1"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "eifinger"; repo = "here_transit"; rev = "v${version}"; - hash = "sha256-C5HZZCmK9ILUUXyx1i/cUggSM3xbOzXiJ13hrT2DWAI="; + hash = "sha256-fORg1iqRcD75Is1EW9XeAu8astibypmnNXo3vHduQdk="; }; postPatch = '' sed -i "/^addopts/d" pyproject.toml ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout yarl @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "here_transit" ]; meta = { - changelog = "https://github.com/eifinger/here_transit/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/eifinger/here_transit/releases/tag/v${version}"; description = "Asynchronous Python client for the HERE Routing V8 API"; homepage = "https://github.com/eifinger/here_transit"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 50beaa7df2668..22948219d3db2 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.51"; + version = "0.52"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-0zLoxXgp4gby2pj96CJ2TOZBMmzuWKczotma7Q/3/ys="; + hash = "sha256-sLtszBu/eyhfIW8xdkHb3FWx2pW/E8cxPeNa4o7DnIs="; }; build-system = [ diff --git a/pkgs/development/python-modules/htmllistparse/default.nix b/pkgs/development/python-modules/htmllistparse/default.nix index 746726bb36374..f2f6b2110688d 100644 --- a/pkgs/development/python-modules/htmllistparse/default.nix +++ b/pkgs/development/python-modules/htmllistparse/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Python parser for Apache/nginx-style HTML directory listing"; mainProgram = "rehttpfs"; license = licenses.mit; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 9a3043affca1b..1170485bf39f9 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "5.0.12"; + version = "5.0.13"; pname = "icalendar"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; rev = "refs/tags/v${version}"; - hash = "sha256-313NcknY2zad4lI+/P0szDVjEQ8VatnSiBiaG/Ta1Bw="; + hash = "sha256-2gpWfLXR4HThw23AWxY2rY9oiK6CF3Qiad8DWHCs4Qk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index 7c8a962ec4629..5edbfdb29a3f8 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "inkbird-ble"; - version = "0.5.6"; + version = "0.5.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-re5HjPtssFkpcltCr0HEJmJyHbXJdkr2wDgaAHfy2Tk="; + hash = "sha256-JmhYYoKz3w3H/WSkJFXrNAsJOmGr+Ex3LGNmgdQgr3s="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ionoscloud/default.nix b/pkgs/development/python-modules/ionoscloud/default.nix index 901c4289cca77..5c296986b58d4 100644 --- a/pkgs/development/python-modules/ionoscloud/default.nix +++ b/pkgs/development/python-modules/ionoscloud/default.nix @@ -40,6 +40,6 @@ buildPythonPackage rec { description = "Python API client for ionoscloud"; changelog = "https://github.com/ionos-cloud/sdk-python/blob/v${version}/docs/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 5d4943a97ced4..c27a5231d3c5a 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -34,12 +34,12 @@ let cudaLibPath = lib.makeLibraryPath ( with cudaPackages; [ - cuda_cudart.lib # libcudart.so - cuda_cupti.lib # libcupti.so - cudnn.lib # libcudnn.so - libcufft.lib # libcufft.so - libcusolver.lib # libcusolver.so - libcusparse.lib # libcusparse.so + (lib.getLib cuda_cudart) # libcudart.so + (lib.getLib cuda_cupti) # libcupti.so + (lib.getLib cudnn) # libcudnn.so + (lib.getLib libcufft) # libcufft.so + (lib.getLib libcusolver) # libcusolver.so + (lib.getLib libcusparse) # libcusparse.so ] ); diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index b77a7de7b3575..7410400ed05a5 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -55,7 +55,6 @@ let inherit (cudaPackages) cudaFlags cudaVersion - cudnn nccl ; @@ -80,18 +79,26 @@ let broken = effectiveStdenv.isDarwin || nccl.meta.unsupported; }; + # Bazel wants a merged cudnn at configuration time + cudnnMerged = symlinkJoin { + name = "cudnn-merged"; + paths = with cudaPackages; [ + (lib.getDev cudnn) + (lib.getLib cudnn) + ]; + }; + # These are necessary at build time and run time. cuda_libs_joined = symlinkJoin { name = "cuda-joined"; paths = with cudaPackages; [ - cuda_cudart.lib # libcudart.so - cuda_cudart.static # libcudart_static.a - cuda_cupti.lib # libcupti.so - libcublas.lib # libcublas.so - libcufft.lib # libcufft.so - libcurand.lib # libcurand.so - libcusolver.lib # libcusolver.so - libcusparse.lib # libcusparse.so + (lib.getLib cuda_cudart) # libcudart.so + (lib.getLib cuda_cupti) # libcupti.so + (lib.getLib libcublas) # libcublas.so + (lib.getLib libcufft) # libcufft.so + (lib.getLib libcurand) # libcurand.so + (lib.getLib libcusolver) # libcusolver.so + (lib.getLib libcusparse) # libcusparse.so ]; }; # These are only necessary at build time. @@ -101,20 +108,23 @@ let cuda_libs_joined # Binaries - cudaPackages.cuda_nvcc.bin # nvcc + (lib.getBin cuda_nvcc) # nvcc + + # Archives + (lib.getOutput "static" cuda_cudart) # libcudart_static.a # Headers - cuda_cccl.dev # block_load.cuh - cuda_cudart.dev # cuda.h - cuda_cupti.dev # cupti.h - cuda_nvcc.dev # See https://github.com/google/jax/issues/19811 - cuda_nvml_dev # nvml.h - cuda_nvtx.dev # nvToolsExt.h - libcublas.dev # cublas_api.h - libcufft.dev # cufft.h - libcurand.dev # curand.h - libcusolver.dev # cusolver_common.h - libcusparse.dev # cusparse.h + (lib.getDev cuda_cccl) # block_load.cuh + (lib.getDev cuda_cudart) # cuda.h + (lib.getDev cuda_cupti) # cupti.h + (lib.getDev cuda_nvcc) # See https://github.com/google/jax/issues/19811 + (lib.getDev cuda_nvml_dev) # nvml.h + (lib.getDev cuda_nvtx) # nvToolsExt.h + (lib.getDev libcublas) # cublas_api.h + (lib.getDev libcufft) # cufft.h + (lib.getDev libcurand) # curand.h + (lib.getDev libcusolver) # cusolver_common.h + (lib.getDev libcusparse) # cusparse.h ]; }; @@ -308,10 +318,10 @@ let + lib.optionalString cudaSupport '' build --config=cuda build --action_env CUDA_TOOLKIT_PATH="${cuda_build_deps_joined}" - build --action_env CUDNN_INSTALL_PATH="${cudnn}" - build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnn},${nccl}" + build --action_env CUDNN_INSTALL_PATH="${cudnnMerged}" + build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnnMerged},${lib.getDev nccl}" build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudaVersion}" - build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" + build --action_env TF_CUDNN_VERSION="${lib.versions.major cudaPackages.cudnn.version}" build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" '' + @@ -374,13 +384,20 @@ let sha256 = ( if cudaSupport then - { x86_64-linux = "sha256-vUoAPkYKEnHkV4fw6BI0mCeuP2e8BMCJnVuZMm9LwSA="; } + { x86_64-linux = "sha256-Uf0VMRE0jgaWEYiuphWkWloZ5jMeqaWBl3lSvk2y1HI="; } else { - x86_64-linux = "sha256-R1TIIyyyLlDqAlUkuhJhtyTxZMra2q5S/jX0OCInsEQ="; - aarch64-linux = "sha256-P5JEmJljN1DeRA0dNkzyosKzRnJH+5SD2aWdV5JsoiY="; + x86_64-linux = "sha256-NzJJg6NlrPGMiR8Fn8u4+fu0m+AulfmN5Xqk63Um6sw="; + aarch64-linux = "sha256-Ro3qzrUxSR+3TH6ROoJTq+dLSufrDN/9oEo2MRkx7wM="; } ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); + + # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 + preInstall = '' + cat << \EOF > "$bazelOut/external/go_sdk/versions.json" + [] + EOF + ''; }; buildAttrs = { @@ -418,7 +435,7 @@ let throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}"; in buildPythonPackage { - inherit meta pname version; + inherit pname version; format = "wheel"; src = @@ -431,13 +448,13 @@ buildPythonPackage { # for more info. postInstall = lib.optionalString cudaSupport '' mkdir -p $out/bin - ln -s ${cudaPackages.cuda_nvcc.bin}/bin/ptxas $out/bin/ptxas + ln -s ${lib.getExe' cudaPackages.cuda_nvcc "ptxas"} $out/bin/ptxas find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do patchelf --add-rpath "${ lib.makeLibraryPath [ cuda_libs_joined - cudnn + (lib.getLib cudaPackages.cudnn) nccl ] }" "$lib" @@ -471,4 +488,11 @@ buildPythonPackage { # Without it there are complaints about libcudart.so.11.0 not being found # because RPATH path entries added above are stripped. dontPatchELF = cudaSupport; + + passthru = { + # Note "bazel.*.tar.gz" can be accessed as `jaxlib.bazel-build.deps` + inherit bazel-build; + }; + + inherit meta; } diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 298ae13d50822..7d2a2b0bfa8e2 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -5,9 +5,7 @@ fetchFromGitHub, hatchling, pythonRelaxDepsHook, - numpy, typeguard, - typing-extensions, cloudpickle, equinox, ipython, @@ -21,7 +19,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.28"; + version = "0.2.31"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,18 +28,16 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-xDFrgPecUIfCACg/xkMQ8G1+6hNiUUDg9eCZKNpNfzs="; + hash = "sha256-kuGFzp8sDLq6J/qq8ap3lD3n1pABHurXcbRUtDQyWwE="; }; - nativeBuildInputs = [ + build-system = [ hatchling pythonRelaxDepsHook ]; - propagatedBuildInputs = [ - numpy + dependencies = [ typeguard - typing-extensions ]; pythonRelaxDeps = [ "typeguard" ]; @@ -70,11 +66,12 @@ let pythonImportsCheck = [ "jaxtyping" ]; - meta = with lib; { + meta = { description = "Type annotations and runtime checking for JAX arrays and PyTrees"; homepage = "https://github.com/google/jaxtyping"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/patrick-kidger/jaxtyping/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; }; in diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index a6ba282e6d295..caed3ddfcf7b1 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { description = "Python Kaldi speech recognition"; homepage = "https://github.com/daanzu/kaldi-active-grammar"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; # Other platforms are supported upstream. platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix index c8983cc65a9f0..a3c9ae63c784f 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { description = "Speech Recognition Toolkit"; homepage = "https://kaldi-asr.org"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 315cae0e0b56f..b7256ec3ccd98 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "keras"; - version = "3.4.0"; + version = "3.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "keras-team"; repo = "keras"; rev = "refs/tags/v${version}"; - hash = "sha256-P/TRczWi/prv5D0/I6yLChIDfc6QdGcRSaF4Dd1Iowk="; + hash = "sha256-Pp84wTvcrWnxuksYUrzs9amapwBC8yU1PA0PE5dRl6k="; }; build-system = [ diff --git a/pkgs/development/python-modules/laundrify-aio/default.nix b/pkgs/development/python-modules/laundrify-aio/default.nix index 70244547abec0..a34e6a533fd37 100644 --- a/pkgs/development/python-modules/laundrify-aio/default.nix +++ b/pkgs/development/python-modules/laundrify-aio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "laundrify-aio"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "laundrify"; repo = "laundrify-pypi"; rev = "v${version}"; - hash = "sha256-mIdw2167H4Ume/DqV+fjRiBrph+8Jj5EEUALDDj4ah8="; + hash = "sha256-XhdIKitUyC5RWW/o98ZyhG7BuVCINsiNWlh3liITKCs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/libclang/default.nix index fe9390a76e1a7..fb66d88b942bb 100644 --- a/pkgs/development/python-modules/libclang/default.nix +++ b/pkgs/development/python-modules/libclang/default.nix @@ -53,6 +53,6 @@ buildPythonPackage { meta = libclang.meta // { description = "Python bindings for the C language family frontend for LLVM"; - maintainers = with lib.maintainers; [ lilyinstarlight ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 60c282a1e59b9..7800dbd0f6b57 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.6"; + version = "3.3.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-N96gdO5sezMyKt0QdX7ORg5DnEVSqb1j+WohvOHdYYU="; + hash = "sha256-3t/YYP7Hnua3fZ4PPN59BcPKHWukygUlcBGfNPOjJAE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 9c1139880a199..e76a008c9edb8 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.23"; + version = "0.6.25"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-wnjd2U2f6ONiSehLpAhLK0VIUVcoxhFuyYWiQu/8YjY="; + hash = "sha256-zv1mlaR/3nRhZBjjcXaOSR574NE2um48DqHhHirRfSU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 36017bb2e1e80..231c14e4ceff3 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -8,12 +8,13 @@ python, pythonOlder, substituteAll, + setuptools, }: buildPythonPackage rec { pname = "objgraph"; version = "3.6.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7" || isPyPy; @@ -29,6 +30,10 @@ buildPythonPackage rec { }) ]; + build-system = [ + setuptools + ]; + passthru.optional-dependencies = { ipython = [ graphviz ]; }; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index b9b961e6c9c40..f7bbc56ff29e1 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.3.1"; + version = "16.4.0"; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-AGBLxN4XVP298a2DS14nfpDFbYTCvX3gx/BNVAj0iH8="; + hash = "sha256-AqOHBioK4EaKux6ZtTWZgQgWLlbtG/SWdgXPb3MYm7o="; }; patches = [ diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 4b66456a416d4..10373acbd4361 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -10,11 +10,12 @@ pytest-asyncio, pytestCheckHook, pytz, + syrupy, }: buildPythonPackage rec { pname = "odp-amsterdam"; - version = "6.0.1"; + version = "6.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-teLjiclkbjlG226gMUgqc2IUEWqKcSm6xIekw+AQPU4="; + hash = "sha256-veBccNxqhqBYKUC5pdjZ1IOWUYUqiNK5pJq1L+8UCxA="; }; postPatch = '' @@ -32,14 +33,17 @@ buildPythonPackage rec { sed -i '/addopts/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = [ "pytz" ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pytz ]; @@ -48,6 +52,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ "odp_amsterdam" ]; diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 72fc64e65c5b2..f253c73d88990 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "oletools"; - version = "0.60.1"; + version = "0.60.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "decalage2"; repo = pname; rev = "v${version}"; - hash = "sha256-H3oL8sk2r267wV0hoHOq9r9DY2Atxs+hZUVb6tmHy0w="; + hash = "sha256-ons1VeWStxUZw2CPpnX9p5I3Q7cMhi34JU8TeuUDt+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index 4d0ff49f2cce2..371118f677d03 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Common widgets for opcua-modeler og opcua-client-gui"; homepage = "https://github.com/FreeOpcUa/opcua-widgets"; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 88e876035d7b5..82094bf7923cd 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.5"; + version = "1.35.9"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vtqqINwO08olJuynsFtsW7Kp8ikZI6tsZHZWnjTfitM="; + hash = "sha256-THsA284Z/LRQ3GJLnAR5GtFJUYw6EJJZzcFTsiCKxaY="; }; build-system = [ diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 96533b823651e..0b083f5d2be70 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "osc"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - hash = "sha256-ze5mgFU3jc+hB1W2ayj4i2dBFJ0CXsZULzbdFMz3G3Y="; + hash = "sha256-YYcTZ4TB/wDl+T3yF5n2Wp0r4v8eWCTO2fjv/ygicmM="; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper diff --git a/pkgs/development/python-modules/pcffont/default.nix b/pkgs/development/python-modules/pcffont/default.nix index 0f5a49c0692fe..db83e7f9c5e2c 100644 --- a/pkgs/development/python-modules/pcffont/default.nix +++ b/pkgs/development/python-modules/pcffont/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pcffont"; - version = "0.0.14"; + version = "0.0.15"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pcffont"; inherit version; - hash = "sha256-S3mK4tY7zNGRX8K81QJVvaYpIaTDLx5zn4vKbhrK9VM="; + hash = "sha256-sJWopdjZ0vM0BrdBgc6XZsDGFN7/NCCBqrCyYCRhT3M="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index 43ef11bebd580..c1657025e0a69 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pdoc"; - version = "14.5.0"; + version = "14.5.1"; disabled = pythonOlder "3.8"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; rev = "v${version}"; - hash = "sha256-lie+lPUVWVgbSGC09gMmy4Z2BdC2CHFYQ60isExvhSk="; + hash = "sha256-YtoY/Sp9r6yIviXFKPYc+N8PjfKX+cZxtCZmR6fr1Tc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 091e9cfd9741e..5f76029900231 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; rev = "refs/tags/${version}"; - hash = "sha256-k5MxpkCAvefSRoNPMAVIvNcCTU5HPicU4XSFXk13O9Q="; + hash = "sha256-J1i1H7AfQdiUIyBpgJK3dkH6C8MoEOwug4YQP+NEPbk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 0e2717c3b2bed..15e281911325d 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.13"; + version = "4.15.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-i898cHYOSrzSreWBmW7W9QBUoyIDKwmt4k2wgutN3bw="; + hash = "sha256-fcKLsx+hCMcY+LE7tHW0oys89MnmnYZndnctGBCiFDk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/polyswarm-api/default.nix b/pkgs/development/python-modules/polyswarm-api/default.nix index 64aa9d27933ba..9aa77f50b62e0 100644 --- a/pkgs/development/python-modules/polyswarm-api/default.nix +++ b/pkgs/development/python-modules/polyswarm-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "polyswarm-api"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "polyswarm"; repo = "polyswarm-api"; rev = "refs/tags/${version}"; - hash = "sha256-zEh8qus/+3mcAaY+SK6FLT6wB6UtGLKPoR1WVZdn9vM="; + hash = "sha256-AH0DJYmZL+EejIkhy97JyekdB6ywf49kka0C2sDbdlY="; }; pythonRelaxDeps = [ "future" ]; diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 99ed394c1ffd5..3f557c8de242d 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch, setuptools, }: @@ -15,6 +16,14 @@ buildPythonPackage rec { hash = "sha256-5dV96nFhJR6RytuEvz7MhSdfsSH9R45Xn4AHd7HUJL0="; }; + patches = [ + (fetchpatch { + # Add optional ignore_case param to wait_for_strings + url = "https://github.com/ionelmc/python-process-tests/commit/236c3e83722a36eddb4abb111a2fcceb49cc9ab7.patch"; + hash = "sha256-LbLaDXHbywvsq++lklNiLw8u0USuiEpuxzpNMhXBWtE="; + }) + ]; + nativeBuildInputs = [ setuptools ]; # No tests diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 25afee42bffdb..081c08582b6e3 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.15.2"; + version = "0.15.3"; format = "wheel"; @@ -24,7 +24,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - hash = "sha256-DF+h+pipsm2uWQZm/1dvJ+Jse6cI/udU7Lngc1ntRYg="; + hash = "sha256-pI7gSdybD3Bk27j3Bksc865Iqhk/qv4Uq9QDobcQKBA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 3081ed70edb5b..be57e85fa5b7c 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.20.3"; + version = "1.20.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-4lMsyzw56gFimUs52mEzy5eKYF9s2ClNi3yfdIBbccY="; + hash = "sha256-eP+tKpcRHHeRQEXMSIItgsUkv5SjQXnMsQbQMm50cpM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 4a9dd9f6a750a..012cf3f7f5c30 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.23"; + version = "0.2.24"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-myqv7zNhSUZTdyujg0ogrbzpypA5APGJhTM+FtrgXNA="; + hash = "sha256-YXqctVB4mphNzhc/u5e0yTNi2R6+ibBiFyPaqHvG7Bk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 7064d03607847..d1cced8ea5072 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -1,24 +1,28 @@ { lib, - arviz, buildPythonPackage, + pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + arviz, cachetools, cloudpickle, - fetchFromGitHub, numpy, pandas, pytensor, - pythonOlder, rich, scipy, - setuptools, threadpoolctl, typing-extensions, }: buildPythonPackage rec { pname = "pymc"; - version = "5.15.1"; + version = "5.16.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +31,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-TAQv3BNSYt750JSZWQibjqzhQ0zXOJDVENMharjr6gQ="; + hash = "sha256-C3D07uouV8QZLplIonmViZoCXb4AAEN+uGvNly2hcMc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index e006bbcefd514..f8e09d76c0e95 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.11"; + version = "1.13.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-N1PcyaVvPBX9ahHedR7pow6jAKwVOMmKqddWhYLtT8w="; + hash = "sha256-zcFcF0a3gyY3WmRiRlQntO8hjbkUm2Cxumn2aKHchvY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysim/default.nix b/pkgs/development/python-modules/pysim/default.nix index 8cbe3dd854b9b..ee828c0f71181 100644 --- a/pkgs/development/python-modules/pysim/default.nix +++ b/pkgs/development/python-modules/pysim/default.nix @@ -64,9 +64,6 @@ buildPythonPackage { description = "Python tool to program SIMs / USIMs / ISIMs"; homepage = "https://github.com/osmocom/pysim"; license = licenses.gpl2; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index 6b529ddb810d4..bad53e61dfa53 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -2,8 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system cython, versioneer, + + # dependencies cons, etuples, filelock, @@ -12,6 +16,8 @@ numpy, scipy, typing-extensions, + + # checks jax, jaxlib, numba, @@ -23,7 +29,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.22.1"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,7 +38,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-FG95+3g+DcqQkyJX3PavfyUWTINFLrgAPTaHYN/jk90="; + hash = "sha256-r7ooPwZSEsypYAf+oWu7leuoIK39gFfHZACrxsbcIV0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-hcl2/default.nix b/pkgs/development/python-modules/python-hcl2/default.nix new file mode 100644 index 0000000000000..07e9d2140fa17 --- /dev/null +++ b/pkgs/development/python-modules/python-hcl2/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + lark, + pytestCheckHook, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "python-hcl2"; + version = "4.3.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "amplify-education"; + repo = "python-hcl2"; + rev = "v${version}"; + hash = "sha256-P/EZG6LVW33X9IDE4TbQxakEfenkOqBJ1RM6BZE/7Kk="; + }; + + disabled = pythonOlder "3.7"; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ lark ]; + + pythonImportsCheck = [ "hcl2" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A parser for HCL2 written in Python using Lark"; + homepage = "https://github.com/amplify-education/python-hcl2"; + changelog = "https://github.com/amplify-education/python-hcl2/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ shivaraj-bh ]; + }; +} diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index ad3d7fd724bc0..fb7d54407ce66 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/named-data/python-ndn"; changelog = "https://github.com/named-data/python-ndn/blob/${src.rev}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix index 7f5dc62febb78..bef8dadf31863 100644 --- a/pkgs/development/python-modules/python-opensky/default.nix +++ b/pkgs/development/python-modules/python-opensky/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-opensky"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-opensky"; rev = "refs/tags/v${version}"; - hash = "sha256-Ia6/Lr/uNuF1u0s4g0tpYaW+hKeLbUKxYC/O+ZBqiXI="; + hash = "sha256-V6iRwWzCnPCvu8eks2sHPYrX3OmaFnNj+i57kQJKYm0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 2bc0c40cc1a00..b89a7534a2ab4 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -2,8 +2,10 @@ lib, stdenv, buildPythonPackage, + setuptools, eventlet, fetchPypi, + fetchpatch, gevent, pkgs, process-tests, @@ -17,7 +19,9 @@ buildPythonPackage rec { pname = "python-redis-lock"; version = "4.0.0"; - format = "setuptools"; + + pyproject = true; + build-system = [ setuptools ]; disabled = pythonOlder "3.7"; @@ -26,7 +30,16 @@ buildPythonPackage rec { hash = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; }; - propagatedBuildInputs = [ redis ] ++ lib.optionals withDjango [ django-redis ]; + patches = [ + (fetchpatch { + url = "https://github.com/ionelmc/python-redis-lock/pull/119.diff"; + hash = "sha256-Fo43+pCtnrEMxMdEEdo0YfJGkBlhhH0GjYNgpZeHF3U="; + }) + + ./test_signal_expiration_increase_sleep.patch + ]; + + dependencies = [ redis ] ++ lib.optionals withDjango [ django-redis ]; nativeCheckInputs = [ eventlet diff --git a/pkgs/development/python-modules/python-redis-lock/test_signal_expiration_increase_sleep.patch b/pkgs/development/python-modules/python-redis-lock/test_signal_expiration_increase_sleep.patch new file mode 100644 index 0000000000000..47e721d37a317 --- /dev/null +++ b/pkgs/development/python-modules/python-redis-lock/test_signal_expiration_increase_sleep.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_redis_lock.py b/tests/test_redis_lock.py +index ac9e3ef..331ab41 100644 +--- a/tests/test_redis_lock.py ++++ b/tests/test_redis_lock.py +@@ -552,7 +552,7 @@ def test_signal_expiration(conn, signal_expire, method): + lock.release() + elif method == 'reset_all': + reset_all(conn) +- time.sleep(0.5) ++ time.sleep(0.6) + assert conn.exists('lock-signal:signal_expiration') + time.sleep((signal_expire - 500) / 1000.0) + assert conn.llen('lock-signal:signal_expiration') == 0 diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix index 55a92fbc7281f..a0cc277aa566f 100644 --- a/pkgs/development/python-modules/python-technove/default.nix +++ b/pkgs/development/python-modules/python-technove/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-technove"; - version = "1.2.2"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Moustachauve"; repo = "pytechnove"; rev = "refs/tags/v${version}"; - hash = "sha256-kc5jR0IM2OagvmtqhicnBbrwrdk3E/iJhRIgUtKoirI="; + hash = "sha256-jQOvnOlRROmYXZBJvRj+Z6aCAGj8YYT6h/79KYntiRY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytlv/default.nix b/pkgs/development/python-modules/pytlv/default.nix index 630cc9a21b3c9..2960c12e95a8f 100644 --- a/pkgs/development/python-modules/pytlv/default.nix +++ b/pkgs/development/python-modules/pytlv/default.nix @@ -24,9 +24,6 @@ buildPythonPackage rec { description = "TLV (tag length lavue) data parser, especially useful for EMV tags parsing"; homepage = "https://github.com/timgabets/pytlv"; license = licenses.lgpl2; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index ec57a02f0acd4..e667590bf1b72 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -4,19 +4,30 @@ buildPythonPackage, fetchFromGitHub, isPy27, + + # build-system + setuptools, + + # dependencies numpy, scikit-learn, - pytestCheckHook, torch, - torchvision, tqdm, + + # optional-dependencies faiss, + tensorboard, + + # tests + cudaSupport, + pytestCheckHook, + torchvision }: buildPythonPackage rec { pname = "pytorch-metric-learning"; version = "2.5.0"; - format = "setuptools"; + pyproject = true; disabled = isPy27; @@ -27,14 +38,30 @@ buildPythonPackage rec { hash = "sha256-1y7VCnzgwFOMeMloVdYyszNhf/zZlBJUjuF4qgA5c0A="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ numpy torch scikit-learn - torchvision tqdm ]; + optional-dependencies = { + with-hooks = [ + # TODO: record-keeper + faiss + tensorboard + ]; + with-hooks-cpu = [ + # TODO: record-keeper + faiss + tensorboard + ]; + }; + preCheck = '' export HOME=$TMP export TEST_DEVICE=cpu @@ -43,29 +70,35 @@ buildPythonPackage rec { # package only requires `unittest`, but use `pytest` to exclude tests nativeCheckInputs = [ - faiss pytestCheckHook - ]; + torchvision + ] ++ lib.flatten (lib.attrValues optional-dependencies); - disabledTests = - [ - # TypeError: setup() missing 1 required positional argument: 'world_size' - "TestDistributedLossWrapper" - # require network access: - "TestInference" - "test_get_nearest_neighbors" - "test_tuplestoweights_sampler" - "test_untrained_indexer" - "test_metric_loss_only" - "test_pca" - # flaky - "test_distributed_classifier_loss_and_miner" - ] - ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - # RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly - "test_global_embedding_space_tester" - "test_with_same_parent_label_tester" - ]; + disabledTests = [ + # network access + "test_tuplestoweights_sampler" + "test_metric_loss_only" + "test_add_to_indexer" + "test_get_nearest_neighbors" + "test_list_of_text" + "test_untrained_indexer" + ] ++ lib.optionals stdenv.isDarwin [ + # AttributeError: module 'torch.distributed' has no attribute 'init_process_group' + "test_single_proc" + ] ++ lib.optionals cudaSupport [ + # crashes with SIGBART + "test_accuracy_calculator_and_faiss_with_torch_and_numpy" + "test_accuracy_calculator_large_k" + "test_custom_knn" + "test_global_embedding_space_tester" + "test_global_two_stream_embedding_space_tester" + "test_index_type" + "test_k_warning" + "test_many_tied_distances" + "test_query_within_reference" + "test_tied_distances" + "test_with_same_parent_label_tester" + ]; meta = { description = "Metric learning library for PyTorch"; diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index bb3c41e5b02c1..4d5b62c62083f 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.29.0"; + version = "0.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cIfX9MpRMXtBfLKHKTzCLkv31fBIyanTQHEs8hHk7aQ="; + hash = "sha256-umLTTbz0h+g2j2wZdioZ4cXwavfnBfbFg8BjKzW8z30="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 325c476000044..1d406e5d3508b 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.3"; + version = "3.9.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-G1WveLVoeWkaKrHRFgCt8HVBnBYNdCb7/JVCm0L4dv8="; + hash = "sha256-Af5WTmvUVO91GfnnjVnShMB188XINBdmk2NWC80REdI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index e681e1f6d5550..99e91d683cfbd 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.9.3"; + version = "0.9.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-tCT43wbDScL/aoQFmLPkrw59a88f4qpNeNa0Q27H9wA="; + hash = "sha256-Iv9WDxtnSXZC++8m6+cr7jG6yNXkK0KR5tyUIzQ4Na0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix index 4278bcf3b3915..db123e0310675 100644 --- a/pkgs/development/python-modules/result/default.nix +++ b/pkgs/development/python-modules/result/default.nix @@ -5,18 +5,24 @@ pytestCheckHook, pytest-asyncio, nix-update-script, + setuptools, + wheel, }: buildPythonPackage rec { pname = "result"; - version = "0.16.1"; - format = "setuptools"; + version = "0.17.0"; + pyproject = true; + build-system = [ + setuptools + wheel + ]; src = fetchFromGitHub { owner = "rustedpy"; repo = "result"; rev = "v${version}"; - hash = "sha256-7BvFIQbl4Udd9GTpbMrAqP0P1BGn/C1CHQ3QUCEMXPs="; + hash = "sha256-o+7qKxGQCeMUnsmEReggvf+XwQWFHRCYArYk3DxCa50="; }; postPatch = '' diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix index ea4dc582c5474..a4a729ce4280c 100644 --- a/pkgs/development/python-modules/s2clientprotocol/default.nix +++ b/pkgs/development/python-modules/s2clientprotocol/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "StarCraft II - client protocol"; - homepage = "https://github.com/Blizzard/sc2client-proto"; + homepage = "https://github.com/Blizzard/s2client-proto"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index 58e87ec60ed1d..4153fe1aa8113 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.9.1"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ppXWRBZVm4QroxZ19S388sRuI5zpaDgJrJqhnwefr3k="; + hash = "sha256-Z2Td/tdXYfQ9/QvM1NeT/OgQ/TYa3CQtWo8O1Dl3+Ao="; }; # no tests diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 98a80ee7b07d4..102d4d6adc83a 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -2,24 +2,21 @@ lib, buildPythonPackage, fetchPypi, - mock, pythonOlder, }: buildPythonPackage rec { pname = "schedule"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hDvAU4uZyT8CuLUOPjmIbAby0AOyT0jhqkyt+j80Enk="; + hash = "sha256-Ff6cdf5f2blifz8ZzA7xQgUI+fmkb0XNB2nvde3l8Lc="; }; - buildInputs = [ mock ]; - preCheck = '' # https://github.com/dbader/schedule/issues/488 substituteInPlace test_schedule.py --replace \ diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix new file mode 100644 index 0000000000000..3f57549a1e39d --- /dev/null +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -0,0 +1,136 @@ +{ + lib, + stdenv, + aiohttp, + apache-beam, + asttokens, + blinker, + bottle, + buildPythonPackage, + celery, + certifi, + chalice, + django, + executing, + falcon, + fetchFromGitHub, + flask, + gevent, + httpx, + jsonschema, + mock, + pure-eval, + pyrsistent, + pyspark, + pysocks, + pytest-forked, + pytest-localserver, + pytest-watch, + pytestCheckHook, + pythonOlder, + quart, + rq, + sanic, + setuptools, + sqlalchemy, + tornado, + urllib3, +}: + +buildPythonPackage rec { + pname = "sentry-sdk"; + version = "1.45.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "getsentry"; + repo = "sentry-python"; + rev = "refs/tags/${version}"; + hash = "sha256-OWoMqJlf0vmBHWWsW6mF4u5X9USzxkFmCJyX7Ws0dD0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + certifi + urllib3 + ]; + + passthru.optional-dependencies = { + aiohttp = [ aiohttp ]; + beam = [ apache-beam ]; + bottle = [ bottle ]; + celery = [ celery ]; + chalice = [ chalice ]; + django = [ django ]; + falcon = [ falcon ]; + flask = [ + flask + blinker + ]; + httpx = [ httpx ]; + pyspark = [ pyspark ]; + pure_eval = [ + asttokens + executing + pure-eval + ]; + quart = [ + quart + blinker + ]; + rq = [ rq ]; + sanic = [ sanic ]; + sqlalchemy = [ sqlalchemy ]; + tornado = [ tornado ]; + }; + + nativeCheckInputs = [ + asttokens + executing + gevent + jsonschema + mock + pure-eval + pyrsistent + pysocks + pytest-forked + pytest-localserver + pytest-watch + pytestCheckHook + ]; + + doCheck = !stdenv.isDarwin; + + disabledTests = [ + # Issue with the asseration + "test_auto_enabling_integrations_catches_import_error" + "test_default_release" + ]; + + disabledTestPaths = + [ + # Varius integration tests fail every once in a while when we + # upgrade dependencies, so don't bother testing them. + "tests/integrations/" + ] + ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ + # test crashes on aarch64 + "tests/test_transport.py" + ]; + + pythonImportsCheck = [ "sentry_sdk" ]; + + meta = with lib; { + description = "Python SDK for Sentry.io"; + homepage = "https://github.com/getsentry/sentry-python"; + changelog = "https://github.com/getsentry/sentry-python/blob/${version}/CHANGELOG.md"; + license = licenses.bsd2; + maintainers = with maintainers; [ + fab + gebner + ]; + }; +} diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 3f57549a1e39d..3e891a8ad6a5b 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -1,136 +1,199 @@ -{ - lib, - stdenv, - aiohttp, - apache-beam, - asttokens, - blinker, - bottle, - buildPythonPackage, - celery, - certifi, - chalice, - django, - executing, - falcon, - fetchFromGitHub, - flask, - gevent, - httpx, - jsonschema, - mock, - pure-eval, - pyrsistent, - pyspark, - pysocks, - pytest-forked, - pytest-localserver, - pytest-watch, - pytestCheckHook, - pythonOlder, - quart, - rq, - sanic, - setuptools, - sqlalchemy, - tornado, - urllib3, +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, certifi +, urllib3 + +# optional-dependencies +, aiohttp +, anthropic +, asyncpg +, apache-beam +, bottle +, celery +, celery-redbeat +, chalice +, clickhouse-driver +, django +, falcon +, fastapi +, flask +, blinker +, markupsafe +, grpcio +, protobuf +, httpx +, huey +, huggingface-hub +, langchain +, loguru +, openai +, tiktoken +, pure-eval +, executing +, asttokens +, pymongo +, pyspark +, quart +, rq +, sanic +, sqlalchemy +, starlette +, tornado + +# checks +, ipdb +, jsonschema +, pip +, pyrsistent +, pysocks +, pytest-asyncio +, pytestCheckHook +, pytest-forked +, pytest-localserver +, pytest-xdist +, pytest-watch +, responses }: buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.45.0"; + version = "2.7.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; - rev = "refs/tags/${version}"; - hash = "sha256-OWoMqJlf0vmBHWWsW6mF4u5X9USzxkFmCJyX7Ws0dD0="; + rev = version; + hash = "sha256-MxpG4R6kWozBR5RiSBI/rCSsM2Gv2XJcx8B3IV3LGVk="; }; - build-system = [ setuptools ]; + postPatch = '' + sed -i "/addopts =/d" pytest.ini + ''; + + build-system = [ + setuptools + ]; dependencies = [ certifi urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; + anthropic = [ anthropic ]; + # TODO: arq + asyncpg = [ asyncpg ]; beam = [ apache-beam ]; bottle = [ bottle ]; celery = [ celery ]; + celery-redbeat = [ celery-redbeat ]; chalice = [ chalice ]; + clickhouse-driver = [ clickhouse-driver ]; django = [ django ]; falcon = [ falcon ]; + fastapi = [ fastapi ]; flask = [ - flask blinker + flask + markupsafe + ]; + grpcio = [ + grpcio + protobuf ]; httpx = [ httpx ]; - pyspark = [ pyspark ]; + huey = [ huey ]; + huggingface-hub = [ huggingface-hub ]; + langchain = [ langchain ]; + loguru = [ loguru ]; + openai = [ + openai + tiktoken + ]; + # TODO: opentelemetry + # TODO: opentelemetry-experimental pure_eval = [ asttokens executing pure-eval ]; + pymongo = [ pymongo ]; + pyspark = [ pyspark ]; quart = [ - quart blinker + quart ]; rq = [ rq ]; sanic = [ sanic ]; sqlalchemy = [ sqlalchemy ]; + starlette = [ starlette ]; + # TODO: starlite tornado = [ tornado ]; }; nativeCheckInputs = [ - asttokens - executing - gevent - jsonschema - mock - pure-eval + ipdb pyrsistent + responses pysocks + setuptools + executing + jsonschema + pip + pytest-asyncio pytest-forked pytest-localserver + pytest-xdist pytest-watch pytestCheckHook ]; - doCheck = !stdenv.isDarwin; - disabledTests = [ - # Issue with the asseration - "test_auto_enabling_integrations_catches_import_error" + # depends on git revision "test_default_release" + # tries to pip install old setuptools version + "test_error_has_existing_trace_context_performance_disabled" + "test_error_has_existing_trace_context_performance_enabled" + "test_error_has_new_trace_context_performance_disabled" + "test_error_has_new_trace_context_performance_enabled" + "test_traces_sampler_gets_correct_values_in_sampling_context" + "test_performance_error" + "test_performance_no_error" + "test_timeout_error" + "test_handled_exception" + "test_unhandled_exception" + # network access + "test_create_connection_trace" + "test_crumb_capture" + "test_getaddrinfo_trace" + "test_omit_url_data_if_parsing_fails" + "test_span_origin" + # AttributeError: type object 'ABCMeta' has no attribute 'setup_once' + "test_ensure_integration_enabled_async_no_original_function_enabled" + "test_ensure_integration_enabled_no_original_function_enabled" + # sess = envelopes[1] + # IndexError: list index out of range + "test_session_mode_defaults_to_request_mode_in_wsgi_handler" + # assert count_item_types["sessions"] == 1 + # assert 0 == 1 + "test_auto_session_tracking_with_aggregates" ]; - disabledTestPaths = - [ - # Varius integration tests fail every once in a while when we - # upgrade dependencies, so don't bother testing them. - "tests/integrations/" - ] - ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ - # test crashes on aarch64 - "tests/test_transport.py" - ]; - pythonImportsCheck = [ "sentry_sdk" ]; meta = with lib; { - description = "Python SDK for Sentry.io"; + description = "Official Python SDK for Sentry.io"; homepage = "https://github.com/getsentry/sentry-python"; - changelog = "https://github.com/getsentry/sentry-python/blob/${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ - fab - gebner - ]; + changelog = "https://github.com/getsentry/sentry-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/development/python-modules/smpp-pdu/default.nix b/pkgs/development/python-modules/smpp-pdu/default.nix index 99fddc36fe767..f42c8dd217a33 100644 --- a/pkgs/development/python-modules/smpp-pdu/default.nix +++ b/pkgs/development/python-modules/smpp-pdu/default.nix @@ -33,9 +33,6 @@ buildPythonPackage { description = "Library for parsing Protocol Data Units (PDUs) in SMPP protocol"; homepage = "https://github.com/hologram-io/smpp.pdu"; license = licenses.asl20; - maintainers = with maintainers; [ - flokli - janik - ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index be7ff2030ca51..d52b7eaa072d9 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-lJ2YDTjUI3mf9Jh6g17rXppFRD3GGpzIMEYdkmz0JuQ="; + hash = "sha256-RMNQRjnP+tTrEU9j3zxmOx/C5cdqwYlD514noZiwtzQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index bed497e92a335..8fbbe87951fd1 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1177"; + version = "3.0.1181"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-sGbbeyKwDjXvV+LFozBclS2lltrZnafBOy62GP6XDMA="; + hash = "sha256-TBuJXP9RJxrhmFtijA/cYrnU5izfTqXm6TIA9dKu2WQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index d311edc188ad6..5f41420dffbca 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -116,7 +116,13 @@ let # cudaPackages.cudnn led to this: # https://github.com/tensorflow/tensorflow/issues/60398 cudnnAttribute = "cudnn_8_6"; - cudnn = cudaPackages.${cudnnAttribute}; + cudnnMerged = symlinkJoin { + name = "cudnn-merged"; + paths = [ + (lib.getDev cudaPackages.${cudnnAttribute}) + (lib.getLib cudaPackages.${cudnnAttribute}) + ]; + }; gentoo-patches = fetchzip { url = "https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.12.0.tar.bz2"; hash = "sha256-SCRX/5/zML7LmKEPJkcM5Tebez9vv/gmE4xhT/jyqWs="; @@ -130,19 +136,30 @@ let withTensorboard = (pythonOlder "3.6") || tensorboardSupport; - # FIXME: migrate to redist cudaPackages - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-merged"; - paths = - [ - cudatoolkit.lib - cudatoolkit.out - ] - ++ lib.optionals (lib.versionOlder cudatoolkit.version "11") [ - # for some reason some of the required libs are in the targets/x86_64-linux - # directory; not sure why but this works around it - "${cudatoolkit}/targets/${stdenv.system}" - ]; + cudaComponents = with cudaPackages; [ + (cuda_nvcc.__spliced.buildHost or cuda_nvcc) + (cuda_nvprune.__spliced.buildHost or cuda_nvprune) + cuda_cccl # block_load.cuh + cuda_cudart # cuda.h + cuda_cupti # cupti.h + cuda_nvcc # See https://github.com/google/jax/issues/19811 + cuda_nvml_dev # nvml.h + cuda_nvtx # nvToolsExt.h + libcublas # cublas_api.h + libcufft # cufft.h + libcurand # curand.h + libcusolver # cusolver_common.h + libcusparse # cusparse.h + ]; + + cudatoolkitDevMerged = symlinkJoin { + name = "cuda-${cudaPackages.cudaVersion}-dev-merged"; + paths = lib.concatMap (p: [ + (lib.getBin p) + (lib.getDev p) + (lib.getLib p) + (lib.getOutput "static" p) # Makes for a very fat closure + ]) cudaComponents; }; # Tensorflow expects bintools at hard-coded paths, e.g. /usr/bin/ar @@ -321,7 +338,7 @@ let ] ++ lib.optionals cudaSupport [ cudatoolkit - cudnn + cudnnMerged ] ++ lib.optionals mklSupport [ mkl ] ++ lib.optionals stdenv.isDarwin [ @@ -402,7 +419,7 @@ let TF_NEED_MPI = tfFeature cudaSupport; TF_NEED_CUDA = tfFeature cudaSupport; - TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; + TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkitDevMerged},${cudnnMerged},${lib.getLib nccl}"; TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; # Needed even when we override stdenv: e.g. for ar @@ -653,7 +670,7 @@ buildPythonPackage { find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do addOpenGLRunpath "$lib" - patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" + patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnnMerged}/lib:${lib.getLib nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" done ''; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 4be63b1b4b4b2..bcd58d8cc9e9a 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-dCkk0ikg8KvB7us4mEcUQ1q3JIRoNbSE6STVZXRBErE="; + hash = "sha256-kkyRQ2cYldx4vK5hAo6LOr+k3YqJihKreE+DTNVHYdM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 4f3fbb94be090..a4b20a75d15bb 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-DX2s3Z3QM8qzUr5nM+9erJG/XHkB96h8S4+KYDfcA8A="; + hash = "sha256-li9okYMPW6PM03cFQRfHKzr48eOguNXmmHnSCBgDqYo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 9597a047bdb48..cc08339f6e0ff 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -301,11 +301,11 @@ buildPythonPackage rec { preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" - export CUPTI_INCLUDE_DIR=${cudaPackages.cuda_cupti.dev}/include - export CUPTI_LIBRARY_DIR=${cudaPackages.cuda_cupti.lib}/lib + export CUPTI_INCLUDE_DIR=${lib.getDev cudaPackages.cuda_cupti}/include + export CUPTI_LIBRARY_DIR=${lib.getLib cudaPackages.cuda_cupti}/lib '' + lib.optionalString (cudaSupport && cudaPackages ? cudnn) '' - export CUDNN_INCLUDE_DIR=${cudnn.dev}/include + export CUDNN_INCLUDE_DIR=${lib.getLib cudnn}/include export CUDNN_LIB_DIR=${cudnn.lib}/lib '' + lib.optionalString rocmSupport '' @@ -453,42 +453,31 @@ buildPythonPackage rec { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl.dev # <thrust/*> - cuda_cudart.dev # cuda_runtime.h and libraries - cuda_cudart.lib - cuda_cudart.static - cuda_cupti.dev # For kineto - cuda_cupti.lib # For kineto - cuda_nvcc.dev # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too - cuda_nvml_dev.dev # <nvml.h> - cuda_nvrtc.dev - cuda_nvrtc.lib - cuda_nvtx.dev - cuda_nvtx.lib # -llibNVToolsExt - libcublas.dev - libcublas.lib - libcufft.dev - libcufft.lib - libcurand.dev - libcurand.lib - libcusolver.dev - libcusolver.lib - libcusparse.dev - libcusparse.lib + cuda_cccl # <thrust/*> + cuda_cudart # cuda_runtime.h and libraries + cuda_cupti # For kineto + cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too + cuda_nvml_dev # <nvml.h> + cuda_nvrtc + cuda_nvtx # -llibNVToolsExt + libcublas + libcufft + libcurand + libcusolver + libcusparse ] ++ lists.optionals (cudaPackages ? cudnn) [ - cudnn.dev - cudnn.lib + cudnn ] ++ lists.optionals useSystemNccl [ # Some platforms do not support NCCL (i.e., Jetson) - nccl.dev # Provides nccl.h AND a static copy of NCCL! + nccl # Provides nccl.h AND a static copy of NCCL! ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof.dev # <cuda_profiler_api.h> + cuda_nvprof # <cuda_profiler_api.h> ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api.dev # <cuda_profiler_api.h> + cuda_profiler_api # <cuda_profiler_api.h> ] ) ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ] diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index f730d649361b8..cc522d35fc011 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.41.2"; + version = "4.42.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-Y3WYO+63n/ATT9RmRJ9JLuhFWUiuBO4NL2KzvzELi+M="; + hash = "sha256-vcwOFprscE8R3AdIJudYme9vvSFJvF+iCzRzBhiggr8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tree-sitter-html/Cargo.lock b/pkgs/development/python-modules/tree-sitter-html/Cargo.lock deleted file mode 100644 index e34eb1cd132d0..0000000000000 --- a/pkgs/development/python-modules/tree-sitter-html/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-html" -version = "0.20.3" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix index 2085ef7bad575..361f53b29bb6e 100644 --- a/pkgs/development/python-modules/tree-sitter-html/default.nix +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,20 +17,8 @@ buildPythonPackage rec { hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock b/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock deleted file mode 100644 index 2a6627a051151..0000000000000 --- a/pkgs/development/python-modules/tree-sitter-javascript/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-javascript" -version = "0.21.3" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix index 50b115c4e7ef8..f6a8782f14061 100644 --- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,22 +17,8 @@ buildPythonPackage rec { hash = "sha256-jsdY9Pd9WqZuBYtk088mx1bRQadC6D2/tGGVY+ZZ0J4="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-json/Cargo.lock b/pkgs/development/python-modules/tree-sitter-json/Cargo.lock deleted file mode 100644 index 1b9b095b26378..0000000000000 --- a/pkgs/development/python-modules/tree-sitter-json/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-json" -version = "0.21.0" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix index acf574bef1d98..45557bd5e2eaf 100644 --- a/pkgs/development/python-modules/tree-sitter-json/default.nix +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,22 +17,8 @@ buildPythonPackage rec { hash = "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-python/Cargo.lock b/pkgs/development/python-modules/tree-sitter-python/Cargo.lock deleted file mode 100644 index 001baef04472e..0000000000000 --- a/pkgs/development/python-modules/tree-sitter-python/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-python" -version = "0.21.0" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix index e42136f5c2ada..399fcb0afc188 100644 --- a/pkgs/development/python-modules/tree-sitter-python/default.nix +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,22 +17,8 @@ buildPythonPackage rec { hash = "sha256-ZQ949GbgzZ/W667J+ekvQbs4bGnbDO+IWejivhxPZXM="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock b/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock deleted file mode 100644 index 406fa5fc19bbe..0000000000000 --- a/pkgs/development/python-modules/tree-sitter-rust/Cargo.lock +++ /dev/null @@ -1,71 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "tree-sitter" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" -dependencies = [ - "cc", - "regex", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.21.2" -dependencies = [ - "cc", - "tree-sitter", -] diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index b2c85aa9c5c1e..c532127dcd145 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -1,11 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, cargo -, rustPlatform -, rustc , setuptools -, wheel , tree-sitter }: @@ -21,25 +17,10 @@ buildPythonPackage rec { hash = "sha256-4CTh6fKSV8TuMHLAfEKWsAeCqeCM2uo6hVmF5KWhyPY="; }; - cargoDeps = rustPlatform.importCargoLock { - # Upstream doesn't track a Cargo.lock file unfortunatly, but they barely - # have rust dependencies so it doesn't cost us too much. - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - build-system = [ - cargo - rustPlatform.cargoSetupHook - rustc setuptools - wheel ]; - passthru.optional-dependencies = { core = [ tree-sitter diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index c5e6a7c61607f..504bc9f396b85 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.2.1"; + version = "9.2.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-lCa9dV8rYyGRff+uOKIT0eq5PRItGRuedgY7IrRZ714="; + hash = "sha256-uPpA/FJRtmD8w5lZCmSsbZWGYRnKuvCx34aAKUWqn8o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 45f86523ac3a6..b493ca0331a18 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.13.0"; + version = "2.13.1"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-CDDY60I1eMMIChOCvbSQi7ZsKSo0mlOccNlvjypq3+U="; + hash = "sha256-iJCVMd8HK22CsAbOg3c4hlnatiyMNFw97V8XtjWJwPQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index da684d66745db..0fd4ba8cdc7be 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.15.5"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mLAX9B+9nPSBHJTDgBOLU1l58LkAkdywfdN58eSqP+I="; + hash = "sha256-fbqR8SCat+n4pn8HoVveSa4tobikb9rYsCIroYuRAhI="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index efcb91c202e52..43422e06177b6 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.3.7"; + version = "5.3.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-ptfT31eUNSpVaZfXAyRcIc2T2p82rXmzUyySSVbI9lI="; + hash = "sha256-iwT7P1KNQVrLzgKgoVO4G5wwg3f86D6/0I0FP8xD0rk="; }; build-system = [ @@ -101,11 +101,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "uproot" ]; - meta = with lib; { + meta = { description = "ROOT I/O in pure Python and Numpy"; homepage = "https://github.com/scikit-hep/uproot5"; changelog = "https://github.com/scikit-hep/uproot5/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index f02a31917c598..946bb76e40409 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "uritools"; - version = "4.0.2"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BN8reH0Ot2IA6DGTgqA1Yvv+R0H9ZsFVBrCNO4IR1XM="; + hash = "sha256-7gahgqnISUZM6dX6kXU5qsyO3SpJJNG3qr7uyryuO8I="; }; pythonImportsCheck = [ "uritools" ]; diff --git a/pkgs/development/python-modules/ush/default.nix b/pkgs/development/python-modules/ush/default.nix index 82c089b99c399..eba36519accaa 100644 --- a/pkgs/development/python-modules/ush/default.nix +++ b/pkgs/development/python-modules/ush/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Powerful API for invoking with external commands"; homepage = "https://github.com/tarruda/python-ush"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index d7ba738dd86fd..3b1dbb241b8b7 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -1,18 +1,20 @@ { lib, + aiofile, backoff, buildPythonPackage, fetchFromGitHub, pythonOlder, pyserial, pyserial-asyncio-fast, + pytest-asyncio, pytestCheckHook, setuptools, }: buildPythonPackage rec { pname = "velbus-aio"; - version = "2024.5.1"; + version = "2024.7.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,19 +23,27 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; rev = "refs/tags/${version}"; - hash = "sha256-rOuw1Iw6mGoXNSqxOlBappARzSGIlii03Hd8/3jWiQg="; + hash = "sha256-lKCeNQkI+KxhDZ2DYZPteLxJ5J1vBahyH2S7QTYAUiQ="; fetchSubmodules = true; }; build-system = [ setuptools ]; dependencies = [ + aiofile backoff pyserial pyserial-asyncio-fast ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; pythonImportsCheck = [ "velbusaio" ]; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 7ccab0a231293..2418f97452db8 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -100,9 +100,9 @@ buildPythonPackage rec { with cudaPackages; [ cuda_cudart # cuda_runtime.h, -lcudart - cuda_cccl.dev # <thrust/*> - libcusparse.dev # cusparse.h - libcublas.dev # cublas_v2.h + cuda_cccl # <thrust/*> + libcusparse # cusparse.h + libcublas # cublas_v2.h libcusolver # cusolverDn.h ] )) diff --git a/pkgs/development/python-modules/wheezy-template/default.nix b/pkgs/development/python-modules/wheezy-template/default.nix index 506f909afac77..fd88225ee69af 100644 --- a/pkgs/development/python-modules/wheezy-template/default.nix +++ b/pkgs/development/python-modules/wheezy-template/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Lightweight template library"; mainProgram = "wheezy.template"; license = licenses.mit; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 261ff0cb89e8a..9a7b7bbef2b15 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -66,11 +66,11 @@ buildPythonPackage { [ # flash-attn build cuda_cudart # cuda_runtime_api.h - libcusparse.dev # cusparse.h - cuda_cccl.dev # nv/target - libcublas.dev # cublas_v2.h - libcusolver.dev # cusolverDn.h - libcurand.dev # curand_kernel.h + libcusparse # cusparse.h + cuda_cccl # nv/target + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcurand # curand_kernel.h ] ); diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index c8f5a7fd08920..94ef1e5592fb2 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.156"; + version = "3.2.168"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-RcYDvxqAyvXFdVo3NqISNJ2aDCUsRwN73r3ilc3IjCk="; + hash = "sha256-hyOnYXk88btH9SdEoBQovZxJqEfy5yClakGyua/Px80="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index fa5881a1cb0c2..a71e385e0a398 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.17.5"; + version = "2.17.6"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-Ay+8NOYq1sBIDhCoju2/L8Ghegmxz5NmtpBLb0hqH/E="; + hash = "sha256-Xw/lyA4J0FkU0MTXbOanDJ+rLCEGCOP7BX9sApu+K6s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 72bd9776797b9..956e460deca39 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.238.2"; + version = "0.238.3"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-l50Z1Vq6wMhUtOXd59waUXM0Xvo4I9twDMSA7Nk1hHU="; + hash = "sha256-WlHta/wXTULehopXeIUdNAQb12Lf0SJnm1HIVHTDshA="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 1c983d6bfd6dd..41f1af56422c3 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1291.0"; + version = "1.1292.1"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-m70XujX2KOTvObjeBtoAbrYddi/+pLDLPXf/o+/DtmU="; + hash = "sha256-N54fSRYTFOlmfpommEFIqbMP5IBkhatMwx4CQ8fd5QI="; }; - npmDepsHash = "sha256-f7sY7eCF8k28UnGyKqOP/exhsZQzUC70nIIjEOXEeC4="; + npmDepsHash = "sha256-VHZqc111cC8AANogxXVg4BFlngdmrrt7E+tCMF5Rl7g="; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 30f7defdfe428..e6197cfec1d9e 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bearer"; - version = "1.43.8"; + version = "1.44.1"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-rDmS13eDPYE/UmyCRsBi1wHOZerYf9QS/pOiPKVxwKA="; + hash = "sha256-zxogzchI/1GQm/1IGQ59w18pWvQC3V/9T6+UaWkWDVM="; }; vendorHash = "sha256-7rTbLnFfdmRQgQfx2w/mO3Ac5ENEFm5XPzApKwlImkE="; diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index 5674846952518..3cf1402c556ed 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.7.3"; + version = "1.8.1"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-iSL0PRHj32PpKoUogej0bc/zXGpS4ZgZG/+9Pewhl4k="; + hash = "sha256-RR4yHrLeEHNLe0Nr8FHm+u+DFJihbibRax41Ss9HDV8="; }; - cargoHash = "sha256-no6ZrH1Ma+n66SLgA3h9dQX8FgeVjFVkxfqR35F/prs="; + cargoHash = "sha256-xCA1kxt70lrCrPygMe98eF8RC/l47EnJPjLaXBccBRE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 3edfe7aea5746..be6c65faec9b8 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.32.2"; + version = "1.34.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-lSK1ETeCnK/NeCHaZoHcgFO5OhbE6XcvbJg1+p9x4Hg="; + hash = "sha256-a2OuxstfZcN49CLn4Tk6DeCXUKZOrMQ7pNDicmNxVRA="; }; - vendorHash = "sha256-LMjDR8tTZPLiIKxvdGjeaVMOh76eYhmAlI7lDJ7HG7I="; + vendorHash = "sha256-rAuFXXoC0zp/n+2Ogxrj7Ji3wpQ45XloOs7nI8K41eo="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index d6f92f25bdfcc..d524da13cfac9 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-ggeZb4Oig5r9WtboUy2nSF6gaHS4BiohqUs+Lrl+s5Y="; + sha256 = "sha256-VOvuHx3oNn2a0mtGcr+yl2sLEhQuFdaD/HuOJU/GzBs="; }; dontUnpack = true; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index d3f0ffa2e3b56..03c301f193626 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -51,6 +51,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/peterheesterman/chit"; license = licenses.mit; - maintainers = with maintainers; [ figsoda lilyball ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/pkgs/development/tools/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix index 54411fc015863..49f7cc3134afb 100644 --- a/pkgs/development/tools/cocoapods/default.nix +++ b/pkgs/development/tools/cocoapods/default.nix @@ -19,7 +19,6 @@ bundlerApp { platforms = platforms.darwin; maintainers = with maintainers; [ peterromfeldhk - lilyball ]; mainProgram = "pod"; }; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 2da9a90e4280b..bef9cdaa6cc89 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -13,21 +13,21 @@ let channels = { stable = { - version = "2.11.3"; + version = "2.11.4"; hash = { - x86_64-linux = "sha256-TaEl7J/Zo/K+j8EGpIauQYR5UucALviuSk0/jgiK83U="; - x86_64-darwin = "sha256-qM2YTvHGeAi1F4V79YoDdsp1NbHFah8L0bppUhmzZyY="; - aarch64-linux = "sha256-gLaxi3h2JrnVecS/k3YHuWM1R1oLXKg5R1aeh3GVREY="; - aarch64-darwin = "sha256-SochFDBspdKfw1xd2FiyI9bp2Y3SbdgbGtzwUDyMsLE="; + x86_64-linux = "sha256-um7bwlHzPh6dF2KspGLQfzSVywWdImUc0U/HTkWT2jA="; + x86_64-darwin = "sha256-AiT63c47obiGnf9Vo0C2F3YoVLWdbH/+pkgFT0Tvzew="; + aarch64-linux = "sha256-7tl58GmO5pBsjSkiF/Oy1r3a+Giko/+2Ir7r4V6vy4c="; + aarch64-darwin = "sha256-e86dqZptcQeGlCclLRfNW3Ku9UucW0vXHBGC7r/0Apc="; }; }; mainline = { - version = "2.12.2"; + version = "2.12.3"; hash = { - x86_64-linux = "sha256-UJnJ64zwuDKzc/yKLQnj//3tXZ/GJpzUUw8KoH3Uf14="; - x86_64-darwin = "sha256-d+BWUEMvta7ZkCOqMTafuR5suIDWPauwTzGOpPDF+ck="; - aarch64-linux = "sha256-ayZZhqL3YLjaUDmHOiY4yXg/+tGR7HpLcwojuagqkKg="; - aarch64-darwin = "sha256-EYB7YLScshBInLBOXVfYs+f+OWC7OF9tEmhhG25pPSo="; + x86_64-linux = "sha256-cg2Xr4yZXVFl081fGYztDa35TnaQYmS/uMqc1z5UAmc="; + x86_64-darwin = "sha256-zK/I/D5N5hcFMrBxebaA5WSRml0RaKrSX1FI/+YSXxI="; + aarch64-linux = "sha256-KRIdyQFTBmhEm0hkdoilYNlQhcpagilc5fZ6k18Riu4="; + aarch64-darwin = "sha256-4q6Sz+ZguMxznPuwf0Ip+KWTDKPPZ/ICdvltVLmQinE="; }; }; }; diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index a0e11089497c2..258edd412b294 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonApplication , fetchFromGitHub -, fetchpatch , makeWrapper # Tie withPlugins through the fixed point here, so it will receive an # overridden version properly @@ -73,7 +72,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "3.11.3"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -82,7 +81,7 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-rDbAWLoEEjygW72YDBsVwiaHdRTVYA9IFxY3XMDleho="; + hash = "sha256-uJj7bSRGdYkA7Jl0qe/DncexWXNfQEEPcqGI7AbwX1w="; }; build-system = [ @@ -137,13 +136,6 @@ buildPythonApplication rec { # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch - # Fix gitpoller, source: https://github.com/buildbot/buildbot/pull/7664 - # Included in next release. - (fetchpatch { - url = "https://github.com/buildbot/buildbot/commit/dd5d61e63e3b0740cc538a225ccf104ccecfc734.patch"; - sha256 = "sha256-CL6uRaKxh8uCBfWQ0tNiLh2Ym0HVatWni8hcuTyAAw0="; - excludes = ["master/buildbot/test/unit/changes/test_gitpoller.py"]; - }) ]; postPatch = '' @@ -171,8 +163,11 @@ buildPythonApplication rec { passthru = { inherit withPlugins; - tests.buildbot = nixosTests.buildbot; updateScript = ./update.sh; + } // lib.optionalAttrs stdenv.isLinux { + tests = { + inherit (nixosTests) buildbot; + }; }; meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index a93cbf28e3b84..3f982a2a36a4c 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -1,15 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: +{ lib, buildPythonPackage, isPy3k, buildbot }: -buildPythonPackage rec { +buildPythonPackage { pname = "buildbot_pkg"; - inherit (buildbot) version; - - src = fetchPypi { - inherit pname version; - hash = "sha256-pO2TmTwbY0cnR+882pl7wDiR6JEK+sHHpAltKmTxiIM="; - }; + inherit (buildbot) src version; postPatch = '' + cd pkg # Their listdir function filters out `node_modules` folders. # Do we have to care about that with Nix...? substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" "" diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 7403498a8c614..45c4d56308945 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }: +{ lib, buildPythonPackage, fetchurl, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }: { # this is exposed for potential plugins to use and for nix-update inherit buildbot-pkg; @@ -6,9 +6,9 @@ pname = "buildbot_www"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-EL5iZ257VXnL+29Jr6r3PVeURX1AcugfZ4RLTjClsXo="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-OzH7ckNL09s4r3f6PIc3q9lLT3NgCdIf0IMwJtwlKiY="; }; # Remove unnecessary circular dependency on buildbot @@ -33,9 +33,9 @@ pname = "buildbot_www_react"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-5QLw5nXnU+z11E5Tgvu9bbbpCTRpV2zXndukcZPRjtE="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-lfurzhNJ5DvuPCD/WJ3k+ajuZzhNF6zGOgSuuD0/+Ys="; }; # Remove unnecessary circular dependency on buildbot @@ -60,9 +60,9 @@ pname = "buildbot_console_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-tzqifo9A/KJF9dLpO7jblVaDjx7++v0wLz1Olc79JxI="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-uKNqnqUkNkd14/6QcquyWp1v59bNWcTB4s8lRO9hkUc="; }; buildInputs = [ buildbot-pkg ]; @@ -82,9 +82,9 @@ pname = "buildbot_react_console_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-fzaqYmaO+vWnQpUvOsPCny3W27atcIHsgeGV6dKEJeg="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-wUrhPbd71F3OfXI5Re1xPnc1/vZxYXxdxX58fnWKjYE="; }; buildInputs = [ buildbot-pkg ]; @@ -104,9 +104,9 @@ pname = "buildbot_waterfall_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-BLIs91k8/A4LYMTDgct7TOWFoLU4qK47Javr8qRzkZQ="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-qc5mP7V2cOR3SOt224i8HVoAyWHvVYbsqfIQvPjesmE="; }; buildInputs = [ buildbot-pkg ]; @@ -126,9 +126,9 @@ pname = "buildbot_react_waterfall_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-dX+tp+WidfLy612+41jz+do/iXQTaIQPcetG8td3jp4="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-s6L4oF/wTOfM9uKFEJ/mjnQWE6oPRcd32lM1p2ox9+I="; }; buildInputs = [ buildbot-pkg ]; @@ -148,9 +148,9 @@ pname = "buildbot_grid_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-2kLGdvmf2mnF21gkDCf6h+bhnsxveaNNh95qczRY824="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-tZRwDqWYjBwguqA6T3ZoY38+QFogXKiTzbg1qjs/spE="; }; buildInputs = [ buildbot-pkg ]; @@ -170,9 +170,9 @@ pname = "buildbot_react_grid_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-rIAbk9+6Wi1PCjizHp9p6jpCwaBgBT5Ch1Sa4VKDoww="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-t++yXEgM4l40grSVccjx399TM/vUTmQOSInfH+Wqi50="; }; buildInputs = [ buildbot-pkg ]; @@ -192,9 +192,9 @@ pname = "buildbot_wsgi_dashboards"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-D9mjEKFrh+ytNbpuN/06XbiBnKjFLopXfjDg28j7niw="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-MkrMcaf2UeUYjkwcdhj4rhBwEtVESJEMtGa7RArNLz0="; }; buildInputs = [ buildbot-pkg ]; @@ -214,9 +214,9 @@ pname = "buildbot_react_wsgi_dashboards"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-q3In0IMAIBUjxSzv4LlH9EJukLYJ3WzoEYkFBZB96W8="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-iCAtKOl/8sfCwa3tsK2oQ+ybs0TVF5uWg4Jv/r7oPWg="; }; buildInputs = [ buildbot-pkg ]; @@ -236,9 +236,9 @@ pname = "buildbot_badges"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-TK4KYn3CWxymTsKWeqHr2i5rdO9ZDHvJrb9RqfKNJV4="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-28vj6wUZEnVUSUWrveJ5tdIjN+l4RDewPnm3IVQPXn4="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index 3936594617c1b..b1e407ef165b3 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -3,8 +3,6 @@ set -eu -o pipefail nix-update buildbot -nix-update --version=skip buildbot-worker -nix-update --version=skip buildbot-plugins.buildbot-pkg nix-update --version=skip buildbot-plugins.www nix-update --version=skip buildbot-plugins.www-react nix-update --version=skip buildbot-plugins.console-view diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 071559eccf6c2..aacdf92e30a53 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchPypi , buildbot , stdenv @@ -22,16 +21,12 @@ , nixosTests }: -buildPythonPackage (rec { +buildPythonPackage ({ pname = "buildbot_worker"; - inherit (buildbot) version; - - src = fetchPypi { - inherit pname version; - hash = "sha256-TFymBnUufOEWZ/IUKd7nebZ+yl58ZChFkGrUxOXn28g="; - }; + inherit (buildbot) src version; postPatch = '' + cd worker substituteInPlace buildbot_worker/scripts/logwatcher.py \ --replace /usr/bin/tail "${coreutils}/bin/tail" ''; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 3cb8c66f36532..ae72eae909421 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.15"; + version = "2.5.16"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-FKOpHvturPJQOhWJh5I7JwDhp0X0Y0ppFejTW1hG6Fk="; + hash = "sha256-FvL7LGgSMxflr7X9Z1qe9qPmDcqEr7ZGM36mtOhlTWY="; }; vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 4ff96bfd32679..f04c55d03fbbc 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-r0C03K/jyL8P0iysa6R1AaHVpB6Bw/FUwBIz7V/rGak="; + hash = "sha256-74pbcY8qAFUOuj/1LCIQ4DHAcxubQcnWDS/oCa2MN3c="; }; - vendorHash = "sha256-8NVkpJEAp3UsM2BnZVcavK+89MELo0T96tTcY0pke6Q="; + vendorHash = "sha256-3gNyB2xwdYNXhWru7smIbNoyM+bqiXvash8NJ7O8pQQ="; doCheck = false; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2e4bb56d0f256..0db8f1f4fbfcc 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.107.0"; + version = "1.108.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-svwFIM1lJI60bdmzZS/QZSzy30HtOf498GgnqLFGKAQ="; + sha256 = "sha256-7qfzayuCpjOY8n+bixvm1OcS+BumkZJ0Oyn1xfNezX4="; }; meta = with lib; { diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 4218896faf13d..c1fd0b4598f1a 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.11.3"; + version = "13.12.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-JgmiWcWGGJOv9P0x/WSlkVhmcNSIX12jKZuZBSHxqkg="; + hash = "sha256-w6tzqbNma7gTnUXOkPtcENO2XcchTXqueZlg08C8vF8="; }; - npmDepsHash = "sha256-dDIw8R2126HLqhU+8dq7zroJ7YHHiV6s8yTSrmtgURM="; + npmDepsHash = "sha256-7/5cZOYMQ3b77aRZkBA5jTDm+PnepzdW6I8RyBNr7oo="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 84885d912129f..da706dcdb30a9 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -18,6 +18,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , gnome +, adwaita-icon-theme , gdk-pixbuf , libxslt , gsettings-desktop-schemas @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf - gnome.adwaita-icon-theme + adwaita-icon-theme ] ++ lib.optionals enableWebkit2gtk [ webkitgtk_4_1 ]; diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 1bf0321b4378b..342cc4009edf4 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -121,6 +121,6 @@ buildPythonApplication rec { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; license = [ licenses.lgpl21Plus ]; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index fc5cd68217ed7..23d9859eeb876 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -14,7 +14,6 @@ bundlerApp { platforms = platforms.darwin; maintainers = with maintainers; [ peterromfeldhk - lilyball nicknovitski ]; }; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index af08a7dfa43de..2d19cc70a2250 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-NlSb0UNe61AG/BQyUFqZEug3VnGTi0W0o0CblvV+oDg="; + hash = "sha256-OgIU+xWkQnU+ngeMrOkMFaQuvcMfVzKvukcJTgInyxM="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index bfbf71b6f5f14..dcba4474f0d32 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "konf"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "SimonTheLeg"; repo = "konf-go"; rev = "v${version}"; - hash = "sha256-uzB3quuex00Gp7YRkgo7gF92oPcBoQtLwG6hqMzK6oo="; + hash = "sha256-GSrR2uLeGodmE1egRtvTyWhJckYUnI97n7dnmjPvu3k="; }; vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index ee0e34f144c9e..0fe6c0fb43dff 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-3sFtYUFUYYHDqF22XJ+pmg+fW2f03IS5CgIXjWg2+Bo="; + sha256 = "sha256-TjZ8n88uldCNfpdReE/SYPkj0m6bBA2lI4SyNAhPFFM="; }; - cargoHash = "sha256-9eUGGDBoeF6EM3Np95rFHU3luGuVZk5iE4kIYlUnEEw="; + cargoHash = "sha256-AkeKAPzgKDvnS+eyAh8MJfPOPFF+v6Rje3eXu7LM6Pk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 9c1203486e797..655a6a8c1ff4e 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-X5XBYTD+DIbHFBMWkLGosZUORexYt83mML/akUzrnFk="; + hash = "sha256-4RpQrlFj0stefVBouxyYN3Pf0PkYZ4cn4IKIskqUhVY="; }; modRoot = "gopls"; - vendorHash = "sha256-XH3kSfnlwmbOLkWJCjKmU1ghCkarn23M0q0vJQHkCe0="; + vendorHash = "sha256-D+ew0XyHRns1i9KAdV5vhCs3Uu338EujYjwU6IIZ8OY="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${version}" ]; diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 73f2facc840e8..92929511e9766 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-c72QFlsCPBW4biTMh1nxQIEkKPjmSmxOD93Kzduswyo="; + hash = "sha256-nOb7hoUOQfmpCYqui+hw5hcL/pURvsMXlksa8KUBjSY="; }; vendorHash = "sha256-jGC8JNlorw0FSc0HhFdUVZJDCNaX4PWPaFKRklufIsQ="; diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index a8d0e373a110d..41d5b50891e52 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-V8bbJg7h/TCv0y8Kwz3h6XMKtxKjJKduCj9e1vcd6AQ="; + hash = "sha256-IfseZsHCSuF1zGq8u3mPju0gxVtR0a7ibHV+tEK6wh0="; }; - cargoHash = "sha256-kR4QJ1QFewI5jKPX9/P1z5J9hnWBIhWExF6JgmDzoJw="; + cargoHash = "sha256-QaoyaeFfoxVoTh4Sg/6EXYPsUD1nNG7MPSH2EeYMLn0="; meta = with lib; { description = "Cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index dabd9484499aa..791b3365b1f8e 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.81.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-iF8HIfxC7WM5YT85HfCTM5hu5yCFnHpDposGDAO3qJI="; + hash = "sha256-nAtC0AFNexI7gdVjroP2GlsES7d+E2RZY0d4VMddvXI="; }; - cargoHash = "sha256-hkmaMzeQLd3l6A3xyLAZk+MrEeUKPd7H2N4Nsz7nBmk="; + cargoHash = "sha256-oM5cROdSHEoGbn7eF/gvu+f0ymhxADR9u7uRB8iH1qc="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/pkgs/development/tools/language-servers/yaml-language-server/default.nix index 90aae9d0d82bf..585ea255ef7d5 100644 --- a/pkgs/development/tools/language-servers/yaml-language-server/default.nix +++ b/pkgs/development/tools/language-servers/yaml-language-server/default.nix @@ -1,10 +1,14 @@ { lib -, mkYarnPackage -, fetchYarnDeps , fetchFromGitHub +, fetchYarnDeps +, fixup-yarn-lock +, makeWrapper +, nodejs +, stdenv +, yarn }: -mkYarnPackage rec { +stdenv.mkDerivation rec { pname = "yaml-language-server"; version = "1.15.0"; @@ -15,21 +19,54 @@ mkYarnPackage rec { hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA="; }; - packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg="; }; + nativeBuildInputs = [ + makeWrapper + fixup-yarn-lock + yarn + ]; + + buildInputs = [ + nodejs + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) - yarn --offline build + yarn --offline compile + yarn --offline build:libs runHook postBuild ''; + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p $out/bin $out/lib/node_modules/yaml-language-server + cp -r . $out/lib/node_modules/yaml-language-server + ln -s $out/lib/node_modules/yaml-language-server/bin/yaml-language-server $out/bin/ + + runHook postInstall + ''; + meta = { changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md"; description = "Language Server for YAML Files"; diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix index e4688cb60d8b4..fe85fb0c451c8 100644 --- a/pkgs/development/tools/manifest-tool/default.nix +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.1.6"; + version = "2.1.7"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - hash = "sha256-/u60hi/KnPVWlNh6nxjXpH0ct5PLVE44deGxhzbayD0="; + hash = "sha256-f3rl4ktqvZlqIBmk9WeZ0IUil2bEAdusdCIvtqm9Gwk="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a8c253e4333cc..1c91797b9dd98 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.63"; + version = "0.2.64"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-umYP/U1UjqWbF1YDZYbQrlMubhxr80FFBDS1NeiI9wI="; + hash = "sha256-r/d961IQVZgKh1eT7tFE1KFVwMhp7E8z+jV1AaqBtiQ="; }; - vendorHash = "sha256-Dt6V1zngSra4ZMSboHzreqwxgH5ovMIB+Bq3eWK6tjA="; + vendorHash = "sha256-FveFo78LuTFKEch/5uqdwksS6c7MLbl+xQvZGSVmTko="; doCheck = false; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 139233ef1f761..9912736cf31ad 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.5"; + version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-3vwct7+oY77EcOg2wldDmhGZyiyLE6ZSoyf9eMj1kjw="; + hash = "sha256-dHoVlcvZeX2+r4SgKDaUHOiNYpSNMFG/WNdL4N10ojQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 66560a91fcabd..aa9bed97069d1 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "v${version}"; - hash = "sha256-jqaYJmezekSKdwg8gNdU/DH6S83dPc5WmTU3nfvKjwo="; + hash = "sha256-HgWfR0kOtP2cSSRGMPuy1qGqcS/4QAWPeBU+lwHnYqI="; }; - vendorHash = "sha256-mPYxBqM4VoSmhtobKAn6p3BXIFGrUzs8gA9x97SmbTw="; + vendorHash = "sha256-P5lOx9CH37Z7mkDshbwS+XJZQdQiqNKl71wR1iUvpm8="; doCheck = false; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index d75cb7f8bc9e5..7c3eb4e194235 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "editorconfig-core-c"; - version = "0.12.8"; + version = "0.12.9"; outputs = [ "out" "dev" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "editorconfig"; repo = "editorconfig-core-c"; rev = "v${finalAttrs.version}"; - hash = "sha256-zhWq87X8n7iyp5HBmV2ZTjcN09zQ/sBXPrGmQT0iRr4="; + hash = "sha256-myJNJxKwgmgm+P2MqnYmW8OC0oYcInL+Suyf/xwX9xo="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 757c4269e79b2..7f3d79f6a3d78 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.12"; + version = "6.6.13"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - hash = "sha256-VCpbBoQOFOylSLS7YLRMCtzwECTmjrNi+L9xYAeIWQE="; + hash = "sha256-lF80lzDaAfd4VNmBHKj4AWaclGE5WimWbY2Iy2cDNHs="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix index 9fe2e386b7ce7..efb4a364a68ea 100644 --- a/pkgs/development/tools/misc/terser/default.nix +++ b/pkgs/development/tools/misc/terser/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.31.0"; + version = "5.31.1"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-rZYzeNBUaimetn/NRugsx6Czc0NxMzAKN58DRcae7pM="; + hash = "sha256-yKJPV6JGZTNCMjHh8v+MgnhaMuGF5cVHGEIJei896Hg="; }; - npmDepsHash = "sha256-SKL//hww6I3RDkqEUBrM0xDSuoPOCArvKKiBz68JtRo="; + npmDepsHash = "sha256-E50RrEllhmluWe726KRmD2pcXbD2bSkWz8x6FeF+kOU="; meta = with lib; { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 8d9a63fcf550c..2008d134b5380 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ gebner lilyball ]; + maintainers = with maintainers; [ gebner ]; mainProgram = "tokei"; }; } diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 829ccd8775f6d..7cda9afee8981 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,25 +1,23 @@ { lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }: let - version = "0.6.9"; + version = "0.7.9"; src = fetchFromGitHub { owner = "litex-hub"; repo = "wishbone-utils"; rev = "v${version}"; - sha256 = "0gq359ybxnqvcp93cn154bs9kwlai62gnm71yvl2nhzjdlcr3fhp"; + hash = "sha256-Gl0bxHJ8Y0ytYJxToYAR2tVkD4YNMihk+zRpieSvMGE="; }; in rustPlatform.buildRustPackage { pname = "wishbone-tool"; inherit version; - src = "${src}/wishbone-tool"; + inherit src; - # N.B. The cargo vendor consistency checker searches in "source" for lockfile - cargoDepsHook = '' - ln -s wishbone-tool source - ''; - cargoSha256 = "1b12wpmzv7wxidc4hd8hmp8iwqhqlycxh8bdv3rf701sqsazkc5x"; + sourceRoot = "${src.name}/wishbone-tool"; + + cargoHash = "sha256-wOw3v47AekJUW+8dpHVysheA+42HwEahn/hriYF7CfA="; buildInputs = [ libusb-compat-0_1 ]; @@ -27,7 +25,7 @@ rustPlatform.buildRustPackage { description = "Manipulate a Wishbone device over some sort of bridge"; mainProgram = "wishbone-tool"; homepage = "https://github.com/litex-hub/wishbone-utils"; - license = licenses.bsd2; + license = licenses.asl20; maintainers = with maintainers; [ edef ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index b87274ea83301..3df3810340081 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.9", + "version": "2.2.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.9", + "version": "2.2.10", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.9" + "@mongosh/cli-repl": "2.2.10" }, "bin": { "mongosh": "bin/mongosh.js" @@ -146,16 +146,16 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.598.0.tgz", - "integrity": "sha512-N/1lnkhkzk1Il8WEZBWR713/7sDEqBtl/1AS6dfgw6Zh7NWUYSwBkZx6xdN8KogDu4CFExRHhilNOgI1JMug3w==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.606.0.tgz", + "integrity": "sha512-CJ3kovUg7HAn3trqo0WxVw3PJoaHxiGU1U+Ok8Vx/sL81+auyyiasT09M/NcchRqwAooKvUi44sVD0ih7Zi9Nw==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.598.0", - "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/client-sso-oidc": "3.606.0", + "@aws-sdk/client-sts": "3.606.0", "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/middleware-host-header": "3.598.0", "@aws-sdk/middleware-logger": "3.598.0", "@aws-sdk/middleware-recursion-detection": "3.598.0", @@ -245,15 +245,14 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.598.0.tgz", - "integrity": "sha512-jfdH1pAO9Tt8Nkta/JJLoUnwl7jaRdxToQTJfUtE+o3+0JP5sA4LfC2rBkJSWcU5BdAA+kyOs5Lv776DlN04Vg==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.606.0.tgz", + "integrity": "sha512-gL1FHPS6hwgMNS/A+Qh5bUyHOeRVOqdb7c6+i+9gR3wtGvt2lvoSm8w5DhS08Xiiacz2AqYRDEapp0xuyCrbBQ==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sts": "3.598.0", "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/middleware-host-header": "3.598.0", "@aws-sdk/middleware-logger": "3.598.0", "@aws-sdk/middleware-recursion-detection": "3.598.0", @@ -292,18 +291,21 @@ }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.606.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz", - "integrity": "sha512-bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.606.0.tgz", + "integrity": "sha512-b11mAhjrkm3MMiAPoMGcmd6vsaz2120lg8rHG/NZCo9vB1K6Kc7WP+a1Q05TRMseer2egTtpWJfn44aVO97VqA==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.598.0", + "@aws-sdk/client-sso-oidc": "3.606.0", "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/middleware-host-header": "3.598.0", "@aws-sdk/middleware-logger": "3.598.0", "@aws-sdk/middleware-recursion-detection": "3.598.0", @@ -362,11 +364,11 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.598.0.tgz", - "integrity": "sha512-u6oocRReswkA2mFlOwtCetgmEr9B+Yhle3K13x37rb1lQgq1wUuWUvHU7U9v26hUZIhfUpigV/Mgr/RQZB6+Yw==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.606.0.tgz", + "integrity": "sha512-4wGvXilFLkozs4/dMnn9NvxZbL9oyyReoF9aR3kGUZ0QVO8cCBp/Zkr8IXZifhVBo9/esJdMFnR9lEXR7Yuleg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-cognito-identity": "3.606.0", "@aws-sdk/types": "3.598.0", "@smithy/property-provider": "^3.1.1", "@smithy/types": "^3.1.0", @@ -434,9 +436,9 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz", - "integrity": "sha512-sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw==", + "version": "3.600.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.600.0.tgz", + "integrity": "sha512-1pC7MPMYD45J7yFjA90SxpR0yaSvy+yZiq23aXhAPZLYgJBAxHLu0s0mDCk/piWGPh8+UGur5K0bVdx4B1D5hw==", "dependencies": { "@aws-sdk/credential-provider-env": "3.598.0", "@aws-sdk/credential-provider-http": "3.598.0", @@ -505,18 +507,18 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.598.0.tgz", - "integrity": "sha512-IFZwH3F2rA2WbpYFUxOeu/M3/9p4+oRbKVLDZlaaDtwwuZ9VHEbnkUm20zOgSXeVExa3qgYhJvg7H5JrqxP97A==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.606.0.tgz", + "integrity": "sha512-34hswGNDWBFvp4Hi4Gv9DIJ4Ks0Nbg8w3emFsPVHLqqI6X2Wd0hJTf+mi1kMhy/AQXt5LisKLw6wjNIKD2+KGg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-cognito-identity": "3.606.0", "@aws-sdk/client-sso": "3.598.0", - "@aws-sdk/client-sts": "3.598.0", - "@aws-sdk/credential-provider-cognito-identity": "3.598.0", + "@aws-sdk/client-sts": "3.606.0", + "@aws-sdk/credential-provider-cognito-identity": "3.606.0", "@aws-sdk/credential-provider-env": "3.598.0", "@aws-sdk/credential-provider-http": "3.598.0", "@aws-sdk/credential-provider-ini": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/credential-provider-process": "3.598.0", "@aws-sdk/credential-provider-sso": "3.598.0", "@aws-sdk/credential-provider-web-identity": "3.598.0", @@ -1168,9 +1170,9 @@ } }, "node_modules/@mongodb-js/mongodb-constants": { - "version": "0.10.1", - "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.1.tgz", - "integrity": "sha512-zs6LSjci2JwkEgc43nmwI4LM0fYRnJpID2tw1NJ2IlqpmW9x1dQFjv1IG401yPr+eoB+Ktzy+EezDrTKl1fMbA==", + "version": "0.10.2", + "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.2.tgz", + "integrity": "sha512-ss0c6IxhSJZwDiY18We3vjFwrCL+1HJntMInFSthJ6oM61yiCCz5m8TfUjNGJQCXhPqok7sM9RSRcKrn43u0cg==", "dependencies": { "semver": "^7.5.4" } @@ -1202,12 +1204,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.9.tgz", - "integrity": "sha512-Bc9v3cmhpfOG3LKRnOyZ/kfDJcQB1mNm7JWD2wJsaFBsWb4S1VXh50l23vC8HIj6vU6QYHGIAc5ikSxZ+shfyQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.10.tgz", + "integrity": "sha512-QvXziAmACrFty7id5I0s3ZOetIc1wWhjtpytGMtchEiusTQOO+NJy74UMrxK+NGxKPDRL0MroRIo05/LEfPkJg==", "dependencies": { - "@mongosh/errors": "2.2.9", - "@mongosh/i18n": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/i18n": "2.2.10", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1215,9 +1217,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.9.tgz", - "integrity": "sha512-JiS0VxGLoHNfLF9zox1dY0jX/3+ygdziigbTfS1AkKWt/Nmf/DURBFFjgLqs3mn3V3qYE4mUCmbeB9G1f6yMYA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.10.tgz", + "integrity": "sha512-ssY+WxY/oOHPZAIjrYzUYhCr1K2towzshxQpYw3nk5JyjTdvN4gc0xnrWMNLJonEOD/ADTdlneFshQhuh/V1vQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1233,12 +1235,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.9.tgz", - "integrity": "sha512-uwBtG2bQVk6N8/A7Jjl6w/FQZKIAUrrfeBA7q4kZ6XWzBY1CKcNOG1Kq5tTrN5xp82Au+FLF0rhFBy195fas0Q==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.10.tgz", + "integrity": "sha512-iLrZ1vfA67jKwEWtSKGYAZ7QM5beYFo4AsmiV+KCXwtcZref3dX1OgcjBvRW8dRvSonz8/7RnN9r8QtsTyw2xw==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.9", + "@mongosh/shell-api": "2.2.10", "semver": "^7.5.4" }, "engines": { @@ -1246,25 +1248,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.9.tgz", - "integrity": "sha512-9gcu2lG9d9aFT+KPRVXpgX84Ounpp0/uuBFln5XuZfKXZwoWbpWD7zJ3mBdzAQKyuZ5SR2x6NokGGZbEbLGhrA==", - "dependencies": { - "@mongosh/arg-parser": "2.2.9", - "@mongosh/autocomplete": "2.2.9", - "@mongosh/editor": "2.2.9", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/i18n": "2.2.9", - "@mongosh/import-node-fetch": "2.2.9", - "@mongosh/js-multiline-to-singleline": "2.2.9", - "@mongosh/logging": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/service-provider-server": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/shell-evaluator": "2.2.9", - "@mongosh/snippet-manager": "2.2.9", - "@mongosh/types": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.10.tgz", + "integrity": "sha512-fjn+GZlsChPqn2A+hWiSgxNcGxO96hPBcv2TDfnXwtMSQySPBavJoayBDbEnazRHxgbAxqpmTV4UfWPOX+jYvA==", + "dependencies": { + "@mongosh/arg-parser": "2.2.10", + "@mongosh/autocomplete": "2.2.10", + "@mongosh/editor": "2.2.10", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/i18n": "2.2.10", + "@mongosh/import-node-fetch": "2.2.10", + "@mongosh/js-multiline-to-singleline": "2.2.10", + "@mongosh/logging": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/service-provider-server": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/shell-evaluator": "2.2.10", + "@mongosh/snippet-manager": "2.2.10", + "@mongosh/types": "2.2.10", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1297,15 +1299,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.9.tgz", - "integrity": "sha512-kTCgkeZBg1AYLKq65elwusyDiKeTyh5l4W3yg2yGvuzhk1I73DPsSkA+E2TWpqVgzsTeRXUbmySSMrKxx/t+mA==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/shell-evaluator": "2.2.9", - "@mongosh/types": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.10.tgz", + "integrity": "sha512-iYNvhBbTNXwR0Dt9bj+hwJFAWVttS2F+zl6vzvF/wcA1THddFi4A8LboWMvDtpb7YF5woHCXIW3Oc3gHOUSW/g==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/shell-evaluator": "2.2.10", + "@mongosh/types": "2.2.10", "js-beautify": "^1.15.1" }, "engines": { @@ -1313,17 +1315,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.9.tgz", - "integrity": "sha512-gN7czs7VK1OoG6H2Cq4gVVUZZPUeBxsBBKeOOFQIGy6QH5IAr4pm/w17K5dhOEoGhdH37h3WOp3dS24z/6NF0A==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.10.tgz", + "integrity": "sha512-jR8dv9MYYRwr+Yri/KI6HAuob0zdVBQOrMvjc+ygBbTIkL3wh1iOrjZKZuYUsjei1FDxLA8NywftAoHDchq2Tg==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.9.tgz", - "integrity": "sha512-Irm8s2z48T+OMADrmJSe+xvCXMkPUCCTltGgVY3w+vm42ftfd6k3ZXGlVu+j/QNCp1D4HmRLDY6RmnQLFb2IUw==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.10.tgz", + "integrity": "sha512-EmMKvsytTXq/1tAwxZUvl+6+gCrarWdEDB9mO9vTCFneOgB0ao2jpo7KA9Jc63r8RYhDH78dtjFsSuFeox3AiA==", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^0.2.3" @@ -1333,20 +1335,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.9.tgz", - "integrity": "sha512-AhEEAHV/2ytZ1swDV7VmKYt4D0P+2pqf8khR3OwOg5RJ0Cx8vRS4RdWvszxKeA26s2zlPMRiherwPTdAEc5zww==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.10.tgz", + "integrity": "sha512-TxyFOhdXqCN0AXGcWziPzZ+YBf8KthnZIbOVSyA+C1a0jynfMf+XBnLnNpwvKfGZUeQ1VyZkrKLPopG7e2nuIA==", "dependencies": { - "@mongosh/errors": "2.2.9" + "@mongosh/errors": "2.2.10" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.9.tgz", - "integrity": "sha512-YbC6nJjnR1kSOZHVD/8gx6hh8eZkkZ9r4M9NFyDTTynbKgZNCwMtFBtl10zYsNMLJOCKW6o8vJ2YFsBLdZNyww==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.10.tgz", + "integrity": "sha512-c0xG7P7HjKn3ND/aK7gyADRFhXc5CogADfX6exkFlM3z5A8HVCZ0o8/x7m0oi3IIHyCvebvEatbZJ+HjdiR8UQ==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1355,9 +1357,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.9.tgz", - "integrity": "sha512-3EPqCQ64zwqR7PpdITBd3e8grpnwE7XIohuVbYXNo48Hlnz0Gdc8QAjSwQF2LO51ozCmPVcrQqCjVuLjdtPBUA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.10.tgz", + "integrity": "sha512-MynI6HGlZ0kPqRfx83+9/An39laBzjlc2f6DzDIiO9FVGYcEYMScIG6e0U06M8fiarqeftprSW9dBdc1KQkeEw==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1367,14 +1369,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.9.tgz", - "integrity": "sha512-/LvJ3Rk2B5Po7JkG/suZIaJybAzCUSvNGRmobwR6HeDJ4RwKMKvPUJrUYu1GXXQqdLNDXH2o9eEWojMk/IA3LQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.10.tgz", + "integrity": "sha512-0z3L23rtaASh1E2hV/wSWxDTycxktbD2XVUnSW1YbyRfePd7YOwVeUhNeFYUf1Qq2q2KeTdxgMaP5/BodY+h5A==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/types": "2.2.10", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^0.2.3" }, @@ -1383,12 +1385,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.9.tgz", - "integrity": "sha512-QJ+4TBD30C3cGoKoBtGOH82RVTKNMcBG1vhs8rfRheajivMLEBka2Hk/49R6yv9lhSfwgueH57+6EFNdqVFgSQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.10.tgz", + "integrity": "sha512-XB+G24WjTIYXnHoToJhDJMwMV7pCcgCwgme0MiE6lzcYs5HwlHhk9tzBwv0+i+3NcCb5SMqU38iUMuGG6jKJdQ==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.9", + "@mongosh/errors": "2.2.10", "bson": "^6.7.0", "mongodb": "^6.7.0", "mongodb-build-info": "^1.7.2" @@ -1401,15 +1403,15 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.9.tgz", - "integrity": "sha512-G4pXkwvvlnFW5sLQAbgDwqpt0tBJHlsQPJN+eMT9N6gRtEnhxAnOuOGA4zKTcaOZN2bTnzd6F7Yu5Z5AOOVXUA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.10.tgz", + "integrity": "sha512-7WxxKZgXNdW7f6vUCmqqWPexPOFqy/n155rFeyWhRVBI5mdbb/Sb5vsdqo1+6AyDpCXsLdl8CldsqmOfGKG36A==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1", "@mongodb-js/oidc-plugin": "^1.0.2", - "@mongosh/errors": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/types": "2.2.10", "aws4": "^1.12.0", "mongodb": "^6.7.0", "mongodb-connection-string-url": "^3.0.1", @@ -1424,15 +1426,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.9.tgz", - "integrity": "sha512-1Wo2RJ1vpYY/LRKKyIgl9vn7nycBVpO+iAaOFRSI0VxcW7dujROIm+XLBzqvJql/0qeqfnQGXv+jCTb13emduw==", - "dependencies": { - "@mongosh/arg-parser": "2.2.9", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/i18n": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.10.tgz", + "integrity": "sha512-Cgcb0U5wqzmTmwAmMkSqhZ3fR4PjqNJ2px61i/9JzWAgIEDSbv9Xni3mcfDRQd/qjLHCEUlAPFgEBu7Cpk0qBQ==", + "dependencies": { + "@mongosh/arg-parser": "2.2.10", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/i18n": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", "mongodb-redact": "^0.2.3" }, "engines": { @@ -1440,27 +1442,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.9.tgz", - "integrity": "sha512-p56jKPaRfFKT4yW3FrmLeawy/8qL7x2q9Gx88e0iJhBI3ybft0dQ1tWvX3mMg6YxZGNsDeHgPSAwNlFAy3lxiQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.10.tgz", + "integrity": "sha512-9v/p5WDu+Ur7+jhXajkBOvpINcRORA1UpdMOV4sBGQ623VbmoDd7xFeFPoi0uWzV50qW5yNRlh3+dvsG/jdKmQ==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/shell-api": "2.2.9" + "@mongosh/async-rewriter2": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/shell-api": "2.2.10" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.9.tgz", - "integrity": "sha512-JG9Svfoh1z30U7mwbojx0Wm2BkVd6wqqkkpxucgJ9ba2DG7VvgN4iez6HQa+eA3KmMKVII7IzYnt/J0gOum80g==", - "dependencies": { - "@mongosh/errors": "2.2.9", - "@mongosh/import-node-fetch": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/types": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.10.tgz", + "integrity": "sha512-y49cANhiCZYaWjaJFLh1ByPJhNAoyZvpI9R1sbA0MC7fu2kWxd91a6mWVWI4ZZPgHGXmpGkAK0/4MpWcUGymsQ==", + "dependencies": { + "@mongosh/errors": "2.2.10", + "@mongosh/import-node-fetch": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/types": "2.2.10", "bson": "^6.7.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1472,9 +1474,9 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.9.tgz", - "integrity": "sha512-Vo91tPc24nrybDsE/wQXbKynB3VC8BvF+yallZpMvLNtckr5q7nTuaTBWG5Er1myPA5MQhZm6DgpsIWR1YnGgg==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.10.tgz", + "integrity": "sha512-BfCcmbC3givNCgYZxf6aUJy+/nHg2By6Hs9gZ/WMGgiedMuL5fRE18dGlwy3Aog7Jc6tVkBCMtOpYgjVnUPoxQ==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1" }, @@ -1588,11 +1590,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.0.1.tgz", - "integrity": "sha512-Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.1.1.tgz", + "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1600,14 +1602,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.2.tgz", - "integrity": "sha512-wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g==", + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.4.tgz", + "integrity": "sha512-VwiOk7TwXoE7NlNguV/aPq1hFH72tqkHCw8eWXbr2xHspRyyv9DLpLXhq+Ieje+NwoqXrY0xyQjPXdOE6cGcHA==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1615,17 +1617,17 @@ } }, "node_modules/@smithy/core": { - "version": "2.2.2", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.2.tgz", - "integrity": "sha512-bxZr4ZTqS6hMSQGYdcsfFQTFU0MO2xKLbkqZMSRDM+ruQ0nY00lFJUeLhXe7fqohSEd1y5wKu1Ap0bVJPzpmHg==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.5", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", - "@smithy/util-middleware": "^3.0.1", + "version": "2.2.4", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.4.tgz", + "integrity": "sha512-qdY3LpMOUyLM/gfjjMQZui+UTNS7kBRDWlvyIhVOql5dn2J3isk9qUTBtQ1CbDH8MTugHis1zu3h4rH+Qmmh4g==", + "dependencies": { + "@smithy/middleware-endpoint": "^3.0.4", + "@smithy/middleware-retry": "^3.0.7", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1633,14 +1635,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz", - "integrity": "sha512-htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.3.tgz", + "integrity": "sha512-U1Yrv6hx/mRK6k8AncuI6jLUx9rn0VVSd9NPEX6pyYFBfkSkChOc/n4zUb8alHUVg83TbI4OdZVo1X0Zfj3ijA==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1648,23 +1650,23 @@ } }, "node_modules/@smithy/fetch-http-handler": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.3.tgz", - "integrity": "sha512-31x2MokxJL/u5U/BdElvVRotOGjUcOOvI2pb5TZ02umBLw+vVHImiLn+khbN0SblaFXNRzPoGrKwXylNjV3skw==", + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.0.tgz", + "integrity": "sha512-vFvDxMrc6sO5Atec8PaISckMcAwsCrRhYxwUylg97bRT2KZoumOF7qk5+6EVUtuM1IG9AJV5aqXnHln9ZdXHpg==", "dependencies": { - "@smithy/protocol-http": "^4.0.1", - "@smithy/querystring-builder": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/protocol-http": "^4.0.3", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/hash-node": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.1.tgz", - "integrity": "sha512-w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.3.tgz", + "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1674,11 +1676,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz", - "integrity": "sha512-RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz", + "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, @@ -1694,12 +1696,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz", - "integrity": "sha512-6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz", + "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==", "dependencies": { - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", + "@smithy/protocol-http": "^4.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1707,16 +1709,16 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz", - "integrity": "sha512-gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w==", - "dependencies": { - "@smithy/middleware-serde": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", - "@smithy/util-middleware": "^3.0.1", + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.4.tgz", + "integrity": "sha512-whUJMEPwl3ANIbXjBXZVdJNgfV2ZU8ayln7xUM47rXL2txuenI7jQ/VFFwCzy5lCmXScjp6zYtptW5Evud8e9g==", + "dependencies": { + "@smithy/middleware-serde": "^3.0.3", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1724,17 +1726,17 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.5.tgz", - "integrity": "sha512-nKAmmea9Wm0d94obPqVgjxW2zzaNemxcTzjgd17LhGKI23D66UQKI5gpoWDsnE+R4tfuZe9dCcw8gmTVEwFpRA==", - "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/service-error-classification": "^3.0.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.7.tgz", + "integrity": "sha512-f5q7Y09G+2h5ivkSx5CHvlAT4qRR3jBFEsfXyQ9nFNiWQlr8c48blnu5cmbTQ+p1xmIO14UXzKoF8d7Tm0Gsjw==", + "dependencies": { + "@smithy/node-config-provider": "^3.1.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "tslib": "^2.6.2", "uuid": "^9.0.1" }, @@ -1743,11 +1745,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz", - "integrity": "sha512-ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz", + "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1755,11 +1757,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz", - "integrity": "sha512-fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz", + "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1767,13 +1769,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz", - "integrity": "sha512-z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.3.tgz", + "integrity": "sha512-rxdpAZczzholz6CYZxtqDu/aKTxATD5DAUDVj7HoEulq+pDSQVWzbg0btZDlxeFfa6bb2b5tUvgdX5+k8jUqcg==", "dependencies": { - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1781,14 +1783,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz", - "integrity": "sha512-hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.1.1.tgz", + "integrity": "sha512-L71NLyPeP450r2J/mfu1jMc//Z1YnqJt2eSNw7uhiItaONnBLDA68J5jgxq8+MBDsYnFwNAIc7dBG1ImiWBiwg==", "dependencies": { - "@smithy/abort-controller": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/querystring-builder": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/abort-controller": "^3.1.1", + "@smithy/protocol-http": "^4.0.3", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1796,11 +1798,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.1.tgz", - "integrity": "sha512-YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.3.tgz", + "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1808,11 +1810,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.1.tgz", - "integrity": "sha512-eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg==", + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.3.tgz", + "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1820,11 +1822,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz", - "integrity": "sha512-vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz", + "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, @@ -1833,11 +1835,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz", - "integrity": "sha512-Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz", + "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1845,22 +1847,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz", - "integrity": "sha512-ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz", + "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==", "dependencies": { - "@smithy/types": "^3.1.0" + "@smithy/types": "^3.3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz", - "integrity": "sha512-nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.3.tgz", + "integrity": "sha512-Z8Y3+08vgoDgl4HENqNnnzSISAaGrF2RoKupoC47u2wiMp+Z8P/8mDh1CL8+8ujfi2U5naNvopSBmP/BUj8b5w==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1868,14 +1870,14 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.0.tgz", - "integrity": "sha512-m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg==", + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.2.tgz", + "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==", "dependencies": { "@smithy/is-array-buffer": "^3.0.0", - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/util-middleware": "^3.0.3", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1885,15 +1887,15 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.3.tgz", - "integrity": "sha512-YVz+akpR5lIIRPJfhE4sqoHYwMys6/33vsFvDof+71FCwa4jkVfMpzKv9TKrG/EDb5TV+YtjdXkwywdqlUOQXA==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", - "@smithy/util-stream": "^3.0.3", + "version": "3.1.5", + "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.5.tgz", + "integrity": "sha512-x9bL9Mx2CT2P1OiUlHM+ZNpbVU6TgT32f9CmTRzqIHA7M4vYrROCWEoC3o4xHNJASoGd4Opos3cXYPgh+/m4Ww==", + "dependencies": { + "@smithy/middleware-endpoint": "^3.0.4", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.0.5", "tslib": "^2.6.2" }, "engines": { @@ -1901,9 +1903,9 @@ } }, "node_modules/@smithy/types": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.1.0.tgz", - "integrity": "sha512-qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw==", + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.3.0.tgz", + "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==", "dependencies": { "tslib": "^2.6.2" }, @@ -1912,12 +1914,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.1.tgz", - "integrity": "sha512-G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.3.tgz", + "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==", "dependencies": { - "@smithy/querystring-parser": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/querystring-parser": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, @@ -1977,13 +1979,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.5.tgz", - "integrity": "sha512-VZkJ+bXCHcNSMhX8EReGyFcc/Err94YGqeEKbbxkVz2TgKlacsoplpi+kxOMVbQq/tq9sQx5ajBKG+nl2GNuxw==", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.7.tgz", + "integrity": "sha512-Q2txLyvQyGfmjsaDbVV7Sg8psefpFcrnlGapDzXGFRPFKRBeEg6OvFK8FljqjeHSaCZ6/UuzQExUPqBR/2qlDA==", "dependencies": { - "@smithy/property-provider": "^3.1.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, @@ -1992,16 +1994,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.5.tgz", - "integrity": "sha512-jy19cFQA0k4f8VUDFsZVBey3rmI8EuXCw/xh/abdiq6S1qdwdfZ5coviuyYd//LPszf2yWIYkLpvmLF9qbhLGg==", - "dependencies": { - "@smithy/config-resolver": "^3.0.2", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.7.tgz", + "integrity": "sha512-F4Qcj1fG6MGi2BSWCslfsMSwllws/WzYONBGtLybyY+halAcXdWhcew+mej8M5SKd5hqPYp4f7b+ABQEaeytgg==", + "dependencies": { + "@smithy/config-resolver": "^3.0.4", + "@smithy/credential-provider-imds": "^3.1.3", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2009,12 +2011,12 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz", - "integrity": "sha512-4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg==", + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.4.tgz", + "integrity": "sha512-ZAtNf+vXAsgzgRutDDiklU09ZzZiiV/nATyqde4Um4priTmasDH+eLpp3tspL0hS2dEootyFMhu1Y6Y+tzpWBQ==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2033,11 +2035,11 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.1.tgz", - "integrity": "sha512-WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.3.tgz", + "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2045,12 +2047,12 @@ } }, "node_modules/@smithy/util-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.1.tgz", - "integrity": "sha512-5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.3.tgz", + "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==", "dependencies": { - "@smithy/service-error-classification": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2058,13 +2060,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.3.tgz", - "integrity": "sha512-ztOvXkXKJromRHNzvrLEW/vvTQPnxPBRHA0gR0QX61LnHDgrm4TBT4EQNpWwwHCD1N0nnEL5bEkzo2dt2t34Kg==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.5.tgz", + "integrity": "sha512-xC3L5PKMAT/Bh8fmHNXP9sdQ4+4aKVUU3EEJ2CF/lLk7R+wtMJM+v/1B4en7jO++Wa5spGzFDBCl0QxgbUc5Ug==", "dependencies": { - "@smithy/fetch-http-handler": "^3.0.3", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/fetch-http-handler": "^3.2.0", + "@smithy/node-http-handler": "^3.1.1", + "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-hex-encoding": "^3.0.0", @@ -2480,9 +2482,9 @@ } }, "node_modules/bson": { - "version": "6.7.0", - "resolved": "https://registry.npmmirror.com/bson/-/bson-6.7.0.tgz", - "integrity": "sha512-w2IquM5mYzYZv6rs3uN2DZTOBe2a0zXLj53TGDqwF4l6Sz/XsISrisXOJihArF9+BZ6Cq/GjVht7Sjfmri7ytQ==", + "version": "6.8.0", + "resolved": "https://registry.npmmirror.com/bson/-/bson-6.8.0.tgz", + "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", "engines": { "node": ">=16.20.1" } @@ -2551,9 +2553,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001636", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", - "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", + "version": "1.0.30001638", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001638.tgz", + "integrity": "sha512-5SuJUJ7cZnhPpeLHaH0c/HPAnAHZvS6ElWyHK9GSIbVOQABLzowiI2pjmpvZ1WEbkyz46iFd4UXlOHR5SqgfMQ==", "funding": [ { "type": "opencollective", @@ -2860,9 +2862,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.805", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.805.tgz", - "integrity": "sha512-8W4UJwX/w9T0QSzINJckTKG6CYpAUTqsaWcWIsdud3I1FYJcMgW9QqT1/4CBff/pP/TihWh13OmiyY8neto6vw==" + "version": "1.4.815", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", + "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -3451,14 +3453,15 @@ } }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "10.4.2", + "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.2.tgz", + "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { @@ -3472,9 +3475,9 @@ } }, "node_modules/glob/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "9.0.5", + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3615,9 +3618,9 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.4", - "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", - "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", + "version": "7.0.5", + "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -3810,9 +3813,9 @@ } }, "node_modules/joi": { - "version": "17.13.1", - "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.1.tgz", - "integrity": "sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==", + "version": "17.13.3", + "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.3.tgz", + "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==", "dependencies": { "@hapi/hoek": "^9.3.0", "@hapi/topo": "^5.1.0", @@ -3822,9 +3825,9 @@ } }, "node_modules/jose": { - "version": "4.15.5", - "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.5.tgz", - "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==", + "version": "4.15.7", + "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.7.tgz", + "integrity": "sha512-L7ioP+JAuZe8v+T5+zVI9Tx8LtU8BL7NxkyDFVMv+Qr3JW0jSoYDedLtodaXwfqMpeCyx4WXFNyu9tJt4WvC1A==", "funding": { "url": "https://github.com/sponsors/panva" } @@ -4138,9 +4141,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.7.0", - "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.7.0.tgz", - "integrity": "sha512-TMKyHdtMcO0fYBNORiYdmM25ijsHs+Njs963r4Tro4OQZzqYigAzYQouwWRg4OIaiLRUEGUh/1UAcH5lxdSLIA==", + "version": "6.8.0", + "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.8.0.tgz", + "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", @@ -4421,9 +4424,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4531,18 +4537,18 @@ } }, "node_modules/pac-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", - "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==", + "version": "7.0.2", + "resolved": "https://registry.npmmirror.com/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.0.2", "debug": "^4.3.4", "get-uri": "^6.0.1", "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", - "pac-resolver": "^7.0.0", - "socks-proxy-agent": "^8.0.2" + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" }, "engines": { "node": ">= 14" @@ -4560,6 +4566,11 @@ "node": ">= 14" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz", @@ -4592,9 +4603,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "version": "10.3.0", + "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.3.0.tgz", + "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==", "engines": { "node": "14 || >=16.14" } @@ -5183,13 +5194,13 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.3", - "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", - "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", + "version": "8.0.4", + "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "dependencies": { "agent-base": "^7.1.1", "debug": "^4.3.4", - "socks": "^2.7.1" + "socks": "^2.8.3" }, "engines": { "node": ">= 14" diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index cdebe929bf966..d9e301c949b23 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.9", - "integrity": "sha512-7zROoz9tFqBW3t4aI6pO9S6GmGuDWb9m8hT0w91uL6CXTHUcYH7XM4INR2jr3+qXFYLkaXZ1WQoLgmuoJoSj7g==", - "filename": "mongosh-2.2.9.tgz", - "deps": "sha256-wefY8JDdtabrtlJfsT4iZsCwYIbIxv8T+U2S29Hl2O4=" + "version": "2.2.10", + "integrity": "sha512-VTuZLREjLMzUDD/s0QEvJFF18A2mvYgxbEfGFr22vDS1se47bxgPcvvuDGQCQvVWC6OG+f75qkwtp8jPkYWa4w==", + "filename": "mongosh-2.2.10.tgz", + "deps": "sha256-iSbFG/Xh2EtGCJfcTLLTJm4BMrTHnnhYuk+FIVE/TJI=" } diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index eda6940f079f7..e57dcffac2c0b 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { mainProgram = "nasmfmt"; homepage = "https://github.com/yamnikov-oleg/nasmfmt"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 8331ecde3e615..6249685b503ba 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.3.65"; + version = "0.3.66"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-QhWoCEoM04/MlUgCFCeAR7kF6QSg0joz/i9ZbXRQtDs="; + sha256 = "sha256-Gh4bhJh5ZB2ZEp3cx1D/r1qyc5SLdQ7RGGR12UaFW/k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index f622e11b14d0e..2fe91c46bcd3e 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-FcrymV0n/Bv0cS9Dx6sG+ifilBiPfaG+xpQvH9mvylQ="; + sha256 = "sha256-ENMFhIVQhPL4FDW9Ne2YGR3sXjvW55NN1bErfr/kDZg="; }; nativeBuildInputs = [ cmake pkg-config python3 ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d2fad639aa21b..50d56bf9ec9ce 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-LU3URVklSjpsQas9xtvIU2OcyMZHqkcA7WaUYCQHfns="; + hash = "sha256-GjC8nc8gpYQ3v0IYJc6vz0809PD6kTWx/HE1UOhTYc0="; }; - vendorHash = "sha256-ipinfk+nFAeyND1HNOehHd+0l5meOPOgbkmCzJlvw+A="; + vendorHash = "sha256-Xmmc30W1ZfMc7YSQswyCjw1KyDA5qi8W+kZ1L7cM3cQ="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index cd2d261aa7218..52a54fbeeaa13 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.34.1"; + version = "1.34.2"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-xbfqN/t6q5dFpg1CkxwxAQkUs8obfckMDqytYzuDwF4="; + hash = "sha256-467+AhA3tADBg6+qbTd1SvLW+INL/1QVR8PzfAMYKFA="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index a11f60bf99c4a..4610cf9326f22 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.06.17.00"; + version = "2024.06.24.00"; src = fetchFromGitHub { owner = "facebookincubator"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J3ZrlX83TE63Go4qp+lMhexkuaV0ZgHNYga8qxZF0wI="; }; - cargoHash = "sha256-xqDMfGNvlyFo3v9GmESfRG+WyQKbzTojOqtYK/tMPxo="; + cargoHash = "sha256-oPo5fmf45FJEoeAXQSZ4+uhKN4CSwhe8AbdPV4ehGd4="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 693b92d746766..27c60b4039018 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-iXqYaRDRaqmI7Y3oEE1fFKYFX/+7Rt3qpzpQ5+l8Z3w="; + hash = "sha256-fJJMbibX/i/l1Qc/V4+loHJ+G/+nnstB0a1dlXkJjk0="; }; - cargoHash = "sha256-LRE18jzgx/aONJkeqzEyDWrWNyp/FmxUGmOy3A9vA7Q="; + cargoHash = "sha256-SelvLaI+vG4PzBcxphBpeFM0nRtaQoTHvuS/8P8/Cig="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 24b64c0cdf6f7..1278a60cf2131 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.36"; + version = "0.2.37"; src = fetchCrate { inherit pname version; - hash = "sha256-Ptv8txt7YXPh1QvFwsoRbBQgeLBGn6iVqst1GHU+JJw="; + hash = "sha256-doN4oL7ZRuORgVsPFMY57zRFwz4m2BqgEgNvnf4t5cU="; }; - cargoHash = "sha256-GkhFbRhEJ+7ikqkNPydKx3Ty8KRsGts5UnwA8bl8Po8="; + cargoHash = "sha256-QWMsDUBJZgXXd20FYDpJYXxofhT7YohTV0hiHePww1o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index db1a2821de963..d6bc6ed754076 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-6GUgxSfuy2v38lYVdjsN0vd63/Aci0ERgG2kF2E2AFA="; + hash = "sha256-xQsj+NjfWc4nU/MKPzWal6n+YZpruypPoUm926JiI7k="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-HC+6AoBx51ahK6QA1Ug7jaKftkE5W3FS629uQ0yrV3Q="; + cargoHash = "sha256-xcytn3cV1Tw6O9glihbyCvERuUBA1yioR4PIbL1T53Q="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index e54021554004e..7aca9708590b7 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.47"; + version = "0.1.49"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1XnCGbOkAmQycwAAEbkoX9xHqBZWYM9v5fp8BdFv7RM="; + sha256 = "sha256-XIr1erxW2S7Ok0DqsDtLn9wRT874o7tIWrt+HrjHACs="; }; - cargoHash = "sha256-awEqrvmu9Kgqlz43/yJFM45WfUXZPLix5LKLtwiXV7U="; + cargoHash = "sha256-x++h5FOb5LXV9miRYZjnZcmp2Djn0P2gdBLAOO977IU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix deleted file mode 100644 index a32a76aeb898f..0000000000000 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper - -, cargo -, nix -, nix-prefetch-git -}: - -rustPlatform.buildRustPackage rec { - pname = "crate2nix"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = pname; - rev = version; - hash = "sha256-rGT3CW64cJS9nlnWPFWSc1iEa3dNZecVVuPVGzcsHe8="; - }; - - sourceRoot = "${src.name}/crate2nix"; - - cargoHash = "sha256-YoE6wrQNQcRo/yaiVpASU2VOmHCPM4pDgTejn0ovOVY="; - - nativeBuildInputs = [ makeWrapper ]; - - # Tests use nix(1), which tries (and fails) to set up /nix/var inside the - # sandbox - doCheck = false; - - postFixup = '' - wrapProgram $out/bin/crate2nix \ - --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]} - - rm -rf $out/lib $out/bin/crate2nix.d - mkdir -p \ - $out/share/bash-completion/completions \ - $out/share/zsh/vendor-completions - $out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions - $out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions - ''; - - meta = with lib; { - description = "Nix build file generator for Rust crates"; - mainProgram = "crate2nix"; - longDescription = '' - Crate2nix generates Nix files from Cargo.toml/lock files - so that you can build every crate individually in a Nix sandbox. - ''; - homepage = "https://github.com/nix-community/crate2nix"; - license = licenses.asl20; - maintainers = with maintainers; [ kolloch cole-h ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 4eb4963760397..0073c6087736f 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.12"; + version = "1.0.14"; src = fetchCrate { inherit pname version; - sha256 = "sha256-nHAsKvNEhGDVrLx8K7xnm7TuCxaZcYwlQ6xjVRvDdSk="; + sha256 = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; - cargoSha256 = "sha256-ydZ0KM/g9k0ux7Zr4crlxnKCC9N/qPzn1wmzbTIyz7o="; + cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; nativeBuildInputs = [ pkg-config ]; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/development/tools/sem/default.nix index 81ae332a66e5d..e8cd2256a59b0 100644 --- a/pkgs/development/tools/sem/default.nix +++ b/pkgs/development/tools/sem/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sem"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ZizmDuEu3D8cVOMw0k1yBXlLft+nzOPnqv5Yi6vk5AM="; + sha256 = "sha256-bShQ+paDM9AdrdPrtwyQ5Mytf/SNZ4fVMDT2ZNswt3o="; }; vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74="; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 0bd4d805a143f..dba5da20c2633 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.3.0"; + version = "3.3.1"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-dTTTcmR4C9UiYEfiKHr0sJBtHg/+sJcGIdrXSOoK1mw="; + hash = "sha256-3Mlid+hvHVjAw5pE6vyieSHWH8Zkoty3GuwE1gB5yQM="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index 2c1688e38c021..bfbfbdf5c1c8d 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "8.0.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-lMfvD5EVWpDcX54nJI3eReF/EMMuZYxtKdHKwk4Lrxk="; + hash = "sha256-5q1vB1EN+Qmss6o6qn4BAaNSwLJBhC8joFJVzncBx6k="; }; - npmDepsHash = "sha256-RVyIpzVom48/avot9bbjXYg2E5+b3GlCHaKNfMEk968="; + npmDepsHash = "sha256-MGuLCuTTUdh2L64j41K6GvCdquCDYPPPEk1Z/9R6sNA="; npmBuildFlags = [ "--production" ]; diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 89132f4c83fbf..0287fd6f8bd8a 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -1,19 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }: buildGoModule rec { pname = "yamlfmt"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VAXDkD4JLoiTomCNtuex/ZEAZtWDEEg5cxETYemvQW8="; + hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI="; }; vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; - doCheck = false; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; + + passthru.tests.version = testers.testVersion { + package = yamlfmt; + }; meta = with lib; { description = "Extensible command line tool or library to format yaml files"; diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index e974007036246..e9352822b3bb8 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -11,7 +11,7 @@ , webkitgtk , makeWrapper , wrapGAppsHook3 -, gnome +, adwaita-icon-theme , gdk-pixbuf }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { webkitgtk glib-networking gdk-pixbuf - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 47743d296e591..cde017c71e5dc 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.75"; + version = "0.2.79"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-7qJDlMy2LmrUMxeacH6n/JP8Zg4ln12iC1BGysejMws="; + hash = "sha256-mnLBSTzeDcxmKNile4Kfe0AABoLgK3EL9HU8r8OPsuc="; }; vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; @@ -27,7 +27,7 @@ buildGoModule rec { patches = [ ./disable-auto-update.patch ]; preBuild = '' - go generate ./... + GOOS= GOARCH= CGO_ENABLED=0 go generate ./... ''; preCheck = '' diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 0d9465b770605..8e94fc35f3811 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -15,22 +15,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "24.06.2"; + version = "24.06.3"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-A7/R7nQUt0L4fKFadPvKyi1sCEUIXcOZSW+Yr1ty63c="; + hash = "sha256-/oyQy4QHU9DCqYplcuINy5y0d2/n+fJCpgwNDURguYU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-tZjR5ebzbm9w5m66Q2cy8Oe1VtqGEDpLfjpgbUh07Lo="; + hash = "sha256-UQRdp/GhiRGfsBF+mV6hCKpEQGFv/I9D9KTtc1p776o="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-/SVtyvsPWv5EGiNTbfHbPtguLi/oNytO16JPnD7IaCM="; + hash = "sha256-zi9yjJirNxFFD7wGa4++J+mDaE5dYZW+X0UUddGkjTU="; }; }; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index d1647eb6a46a1..232a8d7b23c8e 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -4,6 +4,7 @@ , jdk8 , jre , ant +, stripJavaArchivesHook , makeWrapper , makeDesktopItem , copyDesktopItems @@ -41,6 +42,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ jdk8 ant + stripJavaArchivesHook makeWrapper copyDesktopItems ]; @@ -71,7 +73,6 @@ in stdenv.mkDerivation { cp -r build/game/* $out/share/domination/ # Reimplement the two launchers mentioned in Unix_shortcutSpec.xml with makeWrapper - mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/domination \ --chdir "$out/share/domination" \ --add-flags "-jar $out/share/domination/Domination.jar" @@ -83,6 +84,11 @@ in stdenv.mkDerivation { runHook postInstall ''; + preFixup = '' + # remove extra metadata files for jar files which break stripJavaArchivesHook + find $out/share/domination/lib -type f -name '._*.jar' -delete + ''; + passthru.tests = { domination-starts = nixosTests.domination; }; @@ -101,7 +107,8 @@ in stdenv.mkDerivation { fromSource binaryBytecode # source bundles dependencies as jars ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; + mainProgram = "domination"; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 7fb1753445922..0539720ad4528 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.10.6"; + version = "0.10.8"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "sha256-3mprmW6K8pYs7J2q71fohsh9fZEP2RZjN1rSWUAwbhg="; + sha256 = "sha256-bqhltxkoqDdmddOBZ1f3I29AxGm5buUXpjjFwefemEM="; }; patches = [ diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index e32801b769740..0e436ed4a7412 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.107.tar.xz", + "name": "factorio_alpha_x64-1.1.109.tar.xz", "needsAuth": true, - "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", + "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", + "version": "1.1.109" }, "stable": { - "name": "factorio_alpha_x64-1.1.107.tar.xz", + "name": "factorio_alpha_x64-1.1.109.tar.xz", "needsAuth": true, - "sha256": "16hkyfwp02zcijka4yslifz62ry6hrvk0w9960618kqdw3gr7p82", + "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/alpha/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", + "version": "1.1.109" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.107.tar.xz", + "name": "factorio_demo_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", + "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/demo/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/demo/linux64", + "version": "1.1.109" }, "stable": { - "name": "factorio_demo_x64-1.1.107.tar.xz", + "name": "factorio_demo_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "0qc36n6h4wcbnj9rnq162bsml4x3ag1dkjmywqz8f4ydaf86gyjw", + "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/demo/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/demo/linux64", + "version": "1.1.109" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.107.tar.xz", + "name": "factorio_headless_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", + "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/headless/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/headless/linux64", + "version": "1.1.109" }, "stable": { - "name": "factorio_headless_x64-1.1.107.tar.xz", + "name": "factorio_headless_x64-1.1.109.tar.xz", "needsAuth": false, - "sha256": "10ds1nz9sbx9xz1lyypf16wncc6323vpm7l5p11d6iy4cha85wsw", + "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.107/headless/linux64", - "version": "1.1.107" + "url": "https://factorio.com/get-download/1.1.109/headless/linux64", + "version": "1.1.109" } } } diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 453cbfedba949..c4a3614edd6a1 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook3, gst_all_1, gobject-introspection -, python3Packages, gnome }: +, python3Packages, adwaita-icon-theme }: buildPythonApplication { pname = "gscrabble"; @@ -19,7 +19,7 @@ buildPythonApplication { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome.adwaita-icon-theme gtk3 + adwaita-icon-theme gtk3 ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix deleted file mode 100644 index 58ac8b2d77cc4..0000000000000 --- a/pkgs/games/gtetrinet/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, intltool, pkg-config, libgnome, libgnomeui, GConf }: - -stdenv.mkDerivation { - pname = "gtetrinet"; - version = "0.7.11"; - - src = fetchFromGitHub { - owner = "GNOME"; - repo = "gtetrinet"; - rev = "6be3df83f3dc5c7cb966e6cd447182df01b93222"; - sha256 = "1y05x8lfyxvkjg6c87cfd0xxmb22c88scx8fq3gah7hjy5i42v93"; - }; - - nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; - - buildInputs = [ libgnome libgnomeui ]; - - propagatedUserEnvPkgs = [ GConf ]; - - postAutoreconf = '' - intltoolize --force - ''; - - preInstall = '' - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 - ''; - - postInstall = '' - mv "$out/games" "$out/bin" - ''; - - enableParallelBuilding = true; - - meta = { - description = "Client for Tetrinet, a multiplayer online Tetris game"; - mainProgram = "gtetrinet"; - longDescription = '' - GTetrinet is a client program for Tetrinet, a multiplayer tetris game - that is played over the internet. - ''; - homepage = "https://gtetrinet.sourceforge.net/"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.chris-martin ]; - }; -} diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 24f7c96bc9f91..2d1b8f079d2fd 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -20,7 +20,7 @@ buildFHSEnv { gamemode curl gawk - gnome.zenity + zenity plasma5Packages.kdialog mangohud nettools diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index c13bbec0ecfd2..8bb0f795a823f 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 2a914c9412265..3e720aaf9fa40 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK32, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, zenity, libGLU, glib , fetchFromGitHub, fetchpatch }: let @@ -13,7 +13,7 @@ let }; path-env = buildEnv { name = "megaglest-path-env"; - paths = [ bash which gnome.zenity ]; + paths = [ bash which zenity ]; }; in stdenv.mkDerivation { diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 49ce37cc4b579..8489d32a8ed7e 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, fetchpatch , makeWrapper , makeDesktopItem , copyDesktopItems @@ -82,6 +83,19 @@ let patches = [ ./0001-fix-include-path-for-SDL2-on-linux.patch + # Fix build with gradle 8.8, remove on next Arc release + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/2a91c51bf45d700091e397fd0b62384763901ae6.patch"; + hash = "sha256-sSD78GmF14vBvNe+ajUJ4uIc4p857shTP/UkAK6Pyyg="; + extraPrefix = "Arc/"; + stripLen = 1; + }) + (fetchpatch { + url = "https://github.com/Anuken/Arc/commit/d7f8ea858c425410dbd43374271a703d4443b432.patch"; + hash = "sha256-5LPgBOV0r/dUtpyxitTu3/9tMIqjeIKfGVJi3MEr7fQ="; + extraPrefix = "Arc/"; + stripLen = 1; + }) ]; unpackPhase = '' diff --git a/pkgs/games/minecraft-servers/derivation.nix b/pkgs/games/minecraft-servers/derivation.nix index a1b03a0a3b368..68c9fd35f76a5 100644 --- a/pkgs/games/minecraft-servers/derivation.nix +++ b/pkgs/games/minecraft-servers/derivation.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeWrapper ${lib.getExe jre_headless} $out/bin/minecraft-server \ --append-flags "-jar $out/lib/minecraft/server.jar nogui" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + ${lib.optionalString stdenv.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/pkgs/games/openra_2019/common.nix b/pkgs/games/openra_2019/common.nix index 091b56b3d1419..f04f0cf5078a9 100644 --- a/pkgs/games/openra_2019/common.nix +++ b/pkgs/games/openra_2019/common.nix @@ -4,6 +4,8 @@ { lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper , lua, mono, python3 , libGL, freetype, openal, SDL2 +# It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, +# rather than having to look to the logs why it is not starting. , zenity }: diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix index 0bcf71cd87f19..97cdb4335d2c3 100644 --- a/pkgs/games/openra_2019/default.nix +++ b/pkgs/games/openra_2019/default.nix @@ -24,9 +24,6 @@ let fArgs = lib.functionArgs f; in f (builtins.intersectAttrs fArgs pkgs // { lua = pkgs.lua5_1; - # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, - # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/openra_2019/packages.nix b/pkgs/games/openra_2019/packages.nix index 5ee78fe2b8ff1..a88bfd14e2e3e 100644 --- a/pkgs/games/openra_2019/packages.nix +++ b/pkgs/games/openra_2019/packages.nix @@ -13,9 +13,6 @@ let */ common = let f = import ./common.nix; in f (builtins.intersectAttrs (builtins.functionArgs f) pkgs // { lua = pkgs.lua5_1; - # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, - # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/games/opensupaplex/default.nix index 107fc10cbe060..66a2079282cef 100644 --- a/pkgs/games/opensupaplex/default.nix +++ b/pkgs/games/opensupaplex/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, makeDesktopItem -, copyDesktopItems -, testers -, opensupaplex -, SDL2 -, SDL2_mixer +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + makeDesktopItem, + copyDesktopItems, + testers, + opensupaplex, + SDL2, + SDL2_mixer, }: let @@ -68,22 +69,27 @@ stdenv.mkDerivation rec { version = "v${version}"; }; - desktopItems = [(makeDesktopItem { - name = "opensupaplex"; - exec = meta.mainProgram; - icon = "open-supaplex"; - desktopName = "OpenSupaplex"; - comment = meta.description; - categories = [ "Application" "Game" ]; - })]; + desktopItems = [ + (makeDesktopItem { + name = "opensupaplex"; + exec = meta.mainProgram; + icon = "open-supaplex"; + desktopName = "OpenSupaplex"; + comment = meta.description; + categories = [ + "Application" + "Game" + ]; + }) + ]; - meta = with lib; { + meta = { description = "A decompilation of Supaplex in C and SDL"; homepage = "https://github.com/sergiou87/open-supaplex"; changelog = "https://github.com/sergiou87/open-supaplex/blob/master/changelog/v${version}.txt"; - license = licenses.gpl3Only; - maintainers = [ ]; - platforms = platforms.linux; # Many more are supported upstream, but only linux is tested. + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ matteopacini ]; + platforms = lib.platforms.linux; # Many more are supported upstream, but only linux is tested. mainProgram = "opensupaplex"; }; } diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index a6081ca2c3f87..add7a63b86186 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -35,7 +35,7 @@ let unfreeRedistributable # osu-framework contains libbass.so in repository ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ delan gepbird spacefault stepbrobd ]; + maintainers = with lib.maintainers; [ gepbird spacefault stepbrobd ]; mainProgram = "osu!"; platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix index 299248a64d080..5dd169dbc9b49 100644 --- a/pkgs/games/papermc/derivation.nix +++ b/pkgs/games/papermc/derivation.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ --append-flags "-jar $out/share/papermc/papermc.jar nogui" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + ${lib.optionalString stdenvNoCC.isLinux "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]}"} runHook postInstall ''; diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 47732fd05b717..51bdf49551f74 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -52,11 +52,11 @@ "version": "1.20.5-22" }, "1.20.6": { - "hash": "sha256-JMWN40FTFg87RmxwyUr87Js9KyCmaBhj6Dnfe3vblZQ=", - "version": "1.20.6-147" + "hash": "sha256-u9adg4SOJb3w7LBAzJiiJj2V7WbjvVEoqMhVL3v5lL0=", + "version": "1.20.6-148" }, "1.21": { - "hash": "sha256-Anh09jDs+peSU79+jtETFMADt5N3K82QNwru7U0nyHU=", - "version": "1.21-37" + "hash": "sha256-7gHWhy/nlRc1I5LGN1grIAPaVxT8xJST2+I86xSGSc8=", + "version": "1.21-40" } } diff --git a/pkgs/games/shipwright/default.nix b/pkgs/games/shipwright/default.nix index 5b6c422a6ff97..2ee250a703f46 100644 --- a/pkgs/games/shipwright/default.nix +++ b/pkgs/games/shipwright/default.nix @@ -22,7 +22,7 @@ , libpulseaudio , libpng , imagemagick -, gnome +, zenity , makeWrapper , darwin , libicns @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { libXi libXext libpulseaudio - gnome.zenity + zenity ] ++ lib.optionals stdenv.isDarwin [ IOSurface Metal @@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { ''; fixupPhase = lib.optionalString stdenv.isLinux '' - wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ gnome.zenity ]} + wrapProgram $out/lib/soh.elf --prefix PATH ":" ${lib.makeBinPath [ zenity ]} ''; desktopItems = [ diff --git a/pkgs/games/space-station-14-launcher/deps.nix b/pkgs/games/space-station-14-launcher/deps.nix index 239bc10b3b090..0c439f953d363 100644 --- a/pkgs/games/space-station-14-launcher/deps.nix +++ b/pkgs/games/space-station-14-launcher/deps.nix @@ -28,6 +28,9 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0-eap3"; sha256 = "12fkafmx2h1h4av04lc5d8x4v3vw3pnva5vw872r3w8w6ws85r5k"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; sha256 = "02xd4phd6wfixhdq48ma92c166absqw41vdq5kvjch8p0vc9cdl2"; }) + (fetchNuGet { pname = "Linguini.Bundle"; version = "0.8.1"; sha256 = "1p7nn56yd4v4rx5k3x352vdsbvkvyn9lb1739dj111z3jpmw2aja"; }) + (fetchNuGet { pname = "Linguini.Shared"; version = "0.8.0"; sha256 = "08q0p5wz6lf7ab7m18yj5wvwks10c9v3d83f6262wbvkmnms0w06"; }) + (fetchNuGet { pname = "Linguini.Syntax"; version = "0.8.0"; sha256 = "0gfl8j9kdjxgz0iaxs35y801pxflk50kzlf0qq4z42jmh9swi4y7"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index be4a50034b914..cde4cee0384af 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.27.2"; + version = "0.28.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-r+nNZ2xkHMp8bmNNqbf4WnmGP3SIxCtHUCfGxfydTH4="; + hash = "sha256-mBFTXwnxijXAP6i7DNQ/3bujualysCGjDDjmhe15s4I="; fetchSubmodules = true; }; diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 769553a694224..7a42404500bd7 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -1,28 +1,35 @@ -{ lib -, rustPlatform -, steamcmd -, fetchFromGitHub -, steam-run -, runtimeShell -, withWine ? false -, wine +{ + lib, + rustPlatform, + steamcmd, + fetchFromGitHub, + steam-run, + openssl, + pkg-config, + runtimeShell, + withWine ? false, + wine, }: rustPlatform.buildRustPackage rec { pname = "steam-tui"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dmadisetti"; repo = pname; rev = version; - sha256 = "sha256-UTXYlPecv0MVonr9zZwfwopfC/Fdch/ZSCxqgUsem40="; + sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw="; }; - cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; + cargoSha256 = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo="; - buildInputs = [ steamcmd ] - ++ lib.optional withWine wine; + nativeBuildInputs = [ + openssl + pkg-config + ]; + + buildInputs = [ steamcmd ] ++ lib.optional withWine wine; preFixup = '' mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped @@ -34,11 +41,18 @@ rustPlatform.buildRustPackage rec { chmod +x $out/bin/steam-tui ''; + checkFlags = [ "--skip=impure" ]; + + PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig"; + meta = with lib; { description = "Rust TUI client for steamcmd"; homepage = "https://github.com/dmadisetti/steam-tui"; license = licenses.mit; - maintainers = with maintainers; [ lom ]; + maintainers = with maintainers; [ + lom + dmadisetti + ]; # steam only supports that platform platforms = [ "x86_64-linux" ]; mainProgram = "steam-tui"; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a2157da80d6b9..d8e412e57a99f 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -83,7 +83,7 @@ in buildFHSEnv rec { targetPkgs = pkgs: with pkgs; [ steam # License agreement - gnome.zenity + zenity ] ++ commonTargetPkgs pkgs; multiPkgs = pkgs: with pkgs; [ diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix index 14a7310e7a977..a7f0e9f37bc81 100644 --- a/pkgs/games/wireworld/default.nix +++ b/pkgs/games/wireworld/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cc-by-sa-40 ]; downloadPage = "https://ldjam.com/events/ludum-dare/53/wireworld"; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 123e296f5e0a9..a54cea0ae9f96 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { helpMsg = '' We cannot download the full version automatically, as you require a license. Once you have bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux${version}.sh" + You can do this by using "nix-prefetch-url file://\$PWD/${pname}.Linux.${version}.sh" in the directory where you saved it. ''; diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 24e1f204ee267..1da25c36b372b 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,322 +1,322 @@ { "bluedevil": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/bluedevil-6.1.1.tar.xz", - "hash": "sha256-cbaEsptZbByLYDoifvjJswrlF0wnDVog/dS0tthy16A=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/bluedevil-6.1.2.tar.xz", + "hash": "sha256-K/nrgT5Ol9WedgENLiuhRVJd5Ogm155YZNInfHPrQes=" }, "breeze": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-6.1.1.tar.xz", - "hash": "sha256-iUP/dMTLFrGzwD7qDMo5gh1ES+pg3BY/8Y4r0xNglyU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-6.1.2.tar.xz", + "hash": "sha256-1FbcUNlBxJQCCemqUBHV6SAt719lutx+qMbUsqxHfc8=" }, "breeze-grub": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-grub-6.1.1.tar.xz", - "hash": "sha256-e8I83/5IkprzeL0uL9VpY1mknXWdRJFOGssFJex/5WE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-grub-6.1.2.tar.xz", + "hash": "sha256-SAT/QJspSGlkxeRyjpswAdL8Zq0xls+Uwc5U9sVELA4=" }, "breeze-gtk": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-gtk-6.1.1.tar.xz", - "hash": "sha256-p5787M7oWtlUhPjmSr8JItjUoMtUde3RACSvlHxOjs4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-gtk-6.1.2.tar.xz", + "hash": "sha256-W5/RcOtvnpQ4hopexgd4igCo8PqY8+XHxHqUVdzK7BE=" }, "breeze-plymouth": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/breeze-plymouth-6.1.1.tar.xz", - "hash": "sha256-8BHr1RBaervFrz2jVQBG8UO1rUX9hQd0KaBY6RA2dxo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/breeze-plymouth-6.1.2.tar.xz", + "hash": "sha256-VrbRrRKJao5sfqP50CpK5WhNl3IW9oYmCxlq4KMO0Oo=" }, "discover": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/discover-6.1.1.tar.xz", - "hash": "sha256-GOcAU+flHTLELjcTCC5Q6BhiooEXV6lcmNm2hpLTi14=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/discover-6.1.2.tar.xz", + "hash": "sha256-bqi0troUNV/+Br6QNlhqKcwB/GpHUhxvHj+dgYXaXJk=" }, "drkonqi": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/drkonqi-6.1.1.tar.xz", - "hash": "sha256-Z+/eulH1OSz/QshKVDdFbGNK4laWrKOpw64ocFpmUU0=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/drkonqi-6.1.2.tar.xz", + "hash": "sha256-qgBb8y5ZDSy6KNS9qrs733VFAuq5aqvUrI4aUCMrJqU=" }, "flatpak-kcm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/flatpak-kcm-6.1.1.tar.xz", - "hash": "sha256-sc4cl8pPPlAKZAMPvmcjO9M3mKc8XRH4JB662tqjNog=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/flatpak-kcm-6.1.2.tar.xz", + "hash": "sha256-fu3Za0Cq8aquQK7fduX4ZM+zyylas4D2c9x2gZZ1N2g=" }, "kactivitymanagerd": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kactivitymanagerd-6.1.1.tar.xz", - "hash": "sha256-x8DdKkkJAd/PLwlA9TefvhtJ+bMokZ3YBLrq7PlIWqU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kactivitymanagerd-6.1.2.tar.xz", + "hash": "sha256-CKLPz/A0MiSSRfhheLS4Umi//3J9iwq10CBjULjCyv0=" }, "kde-cli-tools": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kde-cli-tools-6.1.1.tar.xz", - "hash": "sha256-oyo5V9WkwkUBxv5xc11ZK+j57oclLYwnMDIs8wdf/ME=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kde-cli-tools-6.1.2.tar.xz", + "hash": "sha256-cYFywGbalVmRkh/ovgOKlzgnOexlPrXQSrK1zIHRdRs=" }, "kdecoration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kdecoration-6.1.1.tar.xz", - "hash": "sha256-zxxT0rbojJeMhVfWwLzTSZr/1prsWtXw2ECzgR5ngyM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kdecoration-6.1.2.tar.xz", + "hash": "sha256-gehd0ni8/uPJDxtfkI7oXyie7mr60dZJZPmQ+cbtvr4=" }, "kde-gtk-config": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kde-gtk-config-6.1.1.tar.xz", - "hash": "sha256-ciZiu3tv7G7yHs8dbaP9qUvq2mvUWMBfK3b+eqU5l6Q=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kde-gtk-config-6.1.2.tar.xz", + "hash": "sha256-6n/NJQPyudrFdv+R83YUSw6qcnRx0NcjqjJH7H0jNiU=" }, "kdeplasma-addons": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kdeplasma-addons-6.1.1.tar.xz", - "hash": "sha256-17MGSyGct4o3pa/0lhIuJQisvWqJRn4oImRYtXS+wSo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kdeplasma-addons-6.1.2.tar.xz", + "hash": "sha256-bAzj5OosXmunSXnzrQ3C1Gcp8yNzL5BnW0fqtJKEEuE=" }, "kgamma": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kgamma-6.1.1.tar.xz", - "hash": "sha256-PQwFkR5tZ/3cxsLkkDwOjffq4BkaWC1XGZCC1TnvyKI=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kgamma-6.1.2.tar.xz", + "hash": "sha256-yz2OcBsaunvYKGsNGWA/uTsN1fHgb1Lej+EooWZmJmM=" }, "kglobalacceld": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kglobalacceld-6.1.1.tar.xz", - "hash": "sha256-OsdZZCQy1EFaaheFbzOqCetv2pnYhrMac5B/0wDziwA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kglobalacceld-6.1.2.tar.xz", + "hash": "sha256-J7OeZ0prZroFs04YG4s57QhIU72HoHLzMzzkxCOmaNw=" }, "kinfocenter": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kinfocenter-6.1.1.tar.xz", - "hash": "sha256-3z7tLSvYVfgAgCYo7sB1ZbctPJKy7Rw488Xiz4Sw7ig=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kinfocenter-6.1.2.tar.xz", + "hash": "sha256-YcAro0UeMyTb9UrzFM78TzibCcnT4K1mYT/sI5/esDw=" }, "kmenuedit": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kmenuedit-6.1.1.tar.xz", - "hash": "sha256-j4Kbms6XdSmdQ8e0qU4KqzOyhf7prwU/5oljadc8JOI=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kmenuedit-6.1.2.tar.xz", + "hash": "sha256-lFS0eEAcDrb8TZDzmcrZpRalqgNmPQiiiRbZYgSv13M=" }, "kpipewire": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kpipewire-6.1.1.tar.xz", - "hash": "sha256-ah1aum6vUwYFuyJRTLsXoUTT6MfBpd3w06nOa0gfdoY=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kpipewire-6.1.2.tar.xz", + "hash": "sha256-JQ9QXXI/tx/fta9fieT4ePYyxTT7KwG6C7s6wZFw1XE=" }, "krdp": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/krdp-6.1.1.tar.xz", - "hash": "sha256-pnBcnksiY0mrp2z2ylliF6DBdzEDDYRheoIXi9r7en0=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/krdp-6.1.2.tar.xz", + "hash": "sha256-D7Gt2cy4YNumaqgNPk1cl6R5asboGZ89+4lfF0r84XY=" }, "kscreen": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kscreen-6.1.1.tar.xz", - "hash": "sha256-3OURnXW5ML859y4Qq0vsTTj5F1+y8C4QNo3JjXyIO/k=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kscreen-6.1.2.tar.xz", + "hash": "sha256-f4VKaWqsWuAcRFbHzhiDfhubDB8W3w0VBfHoPgI5vVw=" }, "kscreenlocker": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kscreenlocker-6.1.1.tar.xz", - "hash": "sha256-VdU6Bfc31TVp6uwledZVzFyjNl3VrlGHgRGYy5XGcak=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kscreenlocker-6.1.2.tar.xz", + "hash": "sha256-urMbZw1LsIJ2AyF5c4x1k6xCkOgdx+wchEJYEpccYto=" }, "ksshaskpass": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/ksshaskpass-6.1.1.tar.xz", - "hash": "sha256-Ltfd0g9kVlts4MSNdNvbRY6HqARZPkRFm+bhxLdT3ac=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/ksshaskpass-6.1.2.tar.xz", + "hash": "sha256-SfkMfFiWyqEs5UlHReAIQYUZF+2xecHnemizh6Labo4=" }, "ksystemstats": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/ksystemstats-6.1.1.tar.xz", - "hash": "sha256-8gfqRhEUPKj4tmCaic30g7X4tJcjTghSFWMahIxOKqs=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/ksystemstats-6.1.2.tar.xz", + "hash": "sha256-MdTU957UUsnMY2JyLBtiGQfM+VJCJA5tVAIbOYA1aTs=" }, "kwallet-pam": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwallet-pam-6.1.1.tar.xz", - "hash": "sha256-LH8hj0fDcchUOd23cejRjUdXzs2H2nR9O5oudk1tDHo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwallet-pam-6.1.2.tar.xz", + "hash": "sha256-51QbihAofWrtMCD/S5KHSSVR+JeXI3m+pIrqmEUK67Q=" }, "kwayland": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwayland-6.1.1.tar.xz", - "hash": "sha256-3JHUr7c72z6rYFKFoQJYkD48EVqYcqwLp5LO9GiP24U=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwayland-6.1.2.tar.xz", + "hash": "sha256-xqIz7GvMZALzQ5hWQjHvKC/BAbTGlzQBCAxLBTFbtZU=" }, "kwayland-integration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwayland-integration-6.1.1.tar.xz", - "hash": "sha256-yL1Xas0uf+xw3SqJy1069sfW/Hp49JFq9CW4Ta+sUrk=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwayland-integration-6.1.2.tar.xz", + "hash": "sha256-CiVhu8T4KzUb5lOr9fRsm0amjzFJVGWqIqWuvpW2lJs=" }, "kwin": { - "version": "6.1.1.2", - "url": "mirror://kde/stable/plasma/6.1.1/kwin-6.1.1.2.tar.xz", - "hash": "sha256-HPDk2ZbM2Sp3tqclYQyjKmDC+uCKmPi3LyqvFWlGTDk=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwin-6.1.2.tar.xz", + "hash": "sha256-gsWCyDsB1CrI3Wyl+8S42u6hkrVN0chZcD5vAzRVwA8=" }, "kwrited": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/kwrited-6.1.1.tar.xz", - "hash": "sha256-pvh6xoSIYzRuhWryDO76PsHCE2DRrwV2j+mwiKE/fH8=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/kwrited-6.1.2.tar.xz", + "hash": "sha256-hWSKR2h5yi9tVfoZEYZvL8dRUh0h1UWyMVOeI6CUFsE=" }, "layer-shell-qt": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/layer-shell-qt-6.1.1.tar.xz", - "hash": "sha256-fGDjcwHo80PvSWVJS2AYb9qCeY3Smq27NXEtr2LjT1M=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/layer-shell-qt-6.1.2.tar.xz", + "hash": "sha256-F+hmjMeDlpoC/gh8HbaF4K8p1yDqpYw51g82+fd29Qk=" }, "libkscreen": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/libkscreen-6.1.1.tar.xz", - "hash": "sha256-lhL9g86Cj4Fv1Vznnadyv2Lpa45kV97rXcM2klz8INQ=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/libkscreen-6.1.2.tar.xz", + "hash": "sha256-NtwBufQwiuwbcJlM8VVNryp3+VDbFc0oX87YtBJYl7g=" }, "libksysguard": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/libksysguard-6.1.1.tar.xz", - "hash": "sha256-vB7YBDc4ZdPeUeXhz3rRHEtx6hMREKOUByWwQzLK7lI=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/libksysguard-6.1.2.tar.xz", + "hash": "sha256-gF1o0qFH4Uknd2yaMZj6bofmLQRTO++6dQd2n2LxLtA=" }, "libplasma": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/libplasma-6.1.1.tar.xz", - "hash": "sha256-LyTxDNIyop+h3FYY7jAGCOm13HeYo+L/+wqOQ5zEItA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/libplasma-6.1.2.tar.xz", + "hash": "sha256-gGFBZOT4wO8AXl0xV7ykp/Qhkl0Wo2oepoQcZlFjIUo=" }, "milou": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/milou-6.1.1.tar.xz", - "hash": "sha256-rxF9ASnqRAv9VEJA7wvdMATmv+i1i8g2ovMG2fX+z4M=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/milou-6.1.2.tar.xz", + "hash": "sha256-lYqQuHWFL7jnDA4yXtFbzsWiRzbuawD3CUYqYzQ5eZc=" }, "ocean-sound-theme": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/ocean-sound-theme-6.1.1.tar.xz", - "hash": "sha256-trYOgt+h/dqCuUy0cF6ShRQxSYKYYKhqgfhI1e0s91M=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/ocean-sound-theme-6.1.2.tar.xz", + "hash": "sha256-y/qE2OhwMG5rIxPzCxYOcUYA8V/lt57Hdk/a8tbpT3s=" }, "oxygen": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/oxygen-6.1.1.tar.xz", - "hash": "sha256-v3GXhxUsM0qC+OfC4LeqGhLEEo6VARMHAm8Ue4/bgtA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/oxygen-6.1.2.tar.xz", + "hash": "sha256-DF3FnL8VLc0/G9oEW3jVP3AucDJDehYssg7qvIfkaLA=" }, "oxygen-sounds": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/oxygen-sounds-6.1.1.tar.xz", - "hash": "sha256-2FjoAmz4gMTHTxm9WoG3pATKrNM8+Y+kMmGK/2dWzlE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/oxygen-sounds-6.1.2.tar.xz", + "hash": "sha256-TtL+lCkFX85k2/EAVyRN11Jv7m6BQmOa2JD6ZWk93ws=" }, "plasma5support": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma5support-6.1.1.tar.xz", - "hash": "sha256-+LhQb0Mm6W+RjdbpyyBAunhep50zytV14zy+mE7gttc=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma5support-6.1.2.tar.xz", + "hash": "sha256-8s9zL+9NHwPfh+71qlVsDeRjD9/1DNZNWe/97CNonJ0=" }, "plasma-activities": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-activities-6.1.1.tar.xz", - "hash": "sha256-Pb3ZJAIIxd/SypY+FCJWRFokRZRz7/azKTAn0NPM6NU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-activities-6.1.2.tar.xz", + "hash": "sha256-PgL8CL23PWVGEFskgZm4amXynWQJBTocYcAVRIcZpts=" }, "plasma-activities-stats": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-activities-stats-6.1.1.tar.xz", - "hash": "sha256-QoRnkP9GHvcM3Nt+3BDzvs8JXgL55hL6GsflJRBNthM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-activities-stats-6.1.2.tar.xz", + "hash": "sha256-OJbDZPA9a3fcfc2t7JQlMPLBjqm7J+DtGHTDgpYfink=" }, "plasma-browser-integration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-browser-integration-6.1.1.tar.xz", - "hash": "sha256-QI4lgS60nNP63ysp+O6cXwQZiaEqJnRBIMcxUDjlxPc=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-browser-integration-6.1.2.tar.xz", + "hash": "sha256-AC2epQsIiSoGLOQ+ReSQKpJt5uv3BzIUlGmWcgdemh8=" }, "plasma-desktop": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-desktop-6.1.1.tar.xz", - "hash": "sha256-leOtnDAYzQWiJm+Xf5ZMJBWEXVgc3aEPDxUXzQDJ9k4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-desktop-6.1.2.tar.xz", + "hash": "sha256-KeQEfEknSt5pliQGlcvavnjBhBgXCAeUBN6/ba2H4tg=" }, "plasma-disks": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-disks-6.1.1.tar.xz", - "hash": "sha256-/usBYRT9rdhi4Yu7hC3eP+hpNdQXXdNW8J5jZkJYpTQ=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-disks-6.1.2.tar.xz", + "hash": "sha256-HxYhy4yrHOTS1dn41NhYUgzwJ+3iz3Sie1v460wZaOY=" }, "plasma-firewall": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-firewall-6.1.1.tar.xz", - "hash": "sha256-JyiCRQe9Ntxv8MK1m5GYmEIVpnpznJwnw//QWrPJOnM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-firewall-6.1.2.tar.xz", + "hash": "sha256-9uoJIH1GPdHGDaMYQLsmeFBmwUVa56oAtl3zWDhyWUw=" }, "plasma-integration": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-integration-6.1.1.tar.xz", - "hash": "sha256-GAvqiS1t0knpjgwyD8rVVzVDQL1sCVjn/nkow0flWX0=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-integration-6.1.2.tar.xz", + "hash": "sha256-4VojKSishXLaoFQE0mtNERLPGJoFHKy99gQ1Lt2/CAQ=" }, "plasma-mobile": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-mobile-6.1.1.tar.xz", - "hash": "sha256-jqjUaFExJWvNMQsKITCnQKMwO6sxhHCx9pAw6MK0TAU=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-mobile-6.1.2.tar.xz", + "hash": "sha256-1UCfsslKYSjgDkA2zPLPPJtGoHXuJXTq5mH6ld+SUDk=" }, "plasma-nano": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-nano-6.1.1.tar.xz", - "hash": "sha256-r2GJdq5D7AZdc/cuGOut+yXz6tZwYtam6APrEgT601I=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-nano-6.1.2.tar.xz", + "hash": "sha256-Y95FHM8YL12cUAUwx3F0WwE87tc/n971EVqMpka5yrc=" }, "plasma-nm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-nm-6.1.1.tar.xz", - "hash": "sha256-NqL3CKrFGvkHuIZk+WQfrFVAsfVfMmufIWLuDLV9+1A=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-nm-6.1.2.tar.xz", + "hash": "sha256-+YbC+NKF4JzS2j0dWLCla6Z77ZmDiR4xmIwdcApGJAg=" }, "plasma-pa": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-pa-6.1.1.tar.xz", - "hash": "sha256-Takyf7qhz5gD5SjGlS+ZeapEe4BiZE+AB9vCkILUyHk=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-pa-6.1.2.tar.xz", + "hash": "sha256-/YTgM2v9zBP63ukVgvoKhY3DahVfPh5Wkd3G/5xrRGY=" }, "plasma-sdk": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-sdk-6.1.1.tar.xz", - "hash": "sha256-/UNWfSSJXesWE4v5k6lmL+2tVk03IhOSZYrpdGVND5A=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-sdk-6.1.2.tar.xz", + "hash": "sha256-CbN17UlLm4a8MNbEYj4hJdhVqAd2DDrCT6wS3Zzcs94=" }, "plasma-systemmonitor": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-systemmonitor-6.1.1.tar.xz", - "hash": "sha256-c4FiyY5lCKPqoQNh7fun4ObNd/eX6ZXzZuQqpS1A6eM=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-systemmonitor-6.1.2.tar.xz", + "hash": "sha256-uofW9/TDye38s3V00SN5hJUhoihrzRbXXFhKkB1MYuw=" }, "plasma-thunderbolt": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-thunderbolt-6.1.1.tar.xz", - "hash": "sha256-dP6Wd4ml2/P2g5lpt5uuDTAVWz/RFdoPW+cqXSF8FFo=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-thunderbolt-6.1.2.tar.xz", + "hash": "sha256-RL+x+fM9XyPqhONcMQRb7D+gbDk4ojuXU+laARr2xCI=" }, "plasma-vault": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-vault-6.1.1.tar.xz", - "hash": "sha256-Kw0gcn4LgHWQ1fn47ZIA4eQsMYSRnfQVDN2BeV0K8+Q=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-vault-6.1.2.tar.xz", + "hash": "sha256-lqltYEE+IffjTu3Z2CXsWgUymsH6wd5b8A8F8IwVDvk=" }, "plasma-welcome": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-welcome-6.1.1.tar.xz", - "hash": "sha256-2uKtZMCIcNuVbZEClxt+I5hF9CDaLtnv30oEU/qtqd4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-welcome-6.1.2.tar.xz", + "hash": "sha256-YqxdxK/krd9IBNnsTqTM9pWzroWIJNTSvlKmp224oKU=" }, "plasma-workspace": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-workspace-6.1.1.tar.xz", - "hash": "sha256-R9LEK9+MEn+hZW9luqmCj5iQz/0/QWsK+eBWzyKMB+4=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-workspace-6.1.2.tar.xz", + "hash": "sha256-R/AZuS3Kho5l5VB/+oPQ2XSt8Y6JXKoTYlYQjMAqZZo=" }, "plasma-workspace-wallpapers": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plasma-workspace-wallpapers-6.1.1.tar.xz", - "hash": "sha256-B/IttxPbjjyCJ0Y5Xok6wS2DRbjDeksJUrujUOW2ffs=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plasma-workspace-wallpapers-6.1.2.tar.xz", + "hash": "sha256-lhn3pNyAsE92gVk4HaMBPmDyFepz+Fdo64th1+DZom4=" }, "plymouth-kcm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/plymouth-kcm-6.1.1.tar.xz", - "hash": "sha256-ZqB/YNbDO+F9k6s7UZnOGxWnvmtRJ7Tw07SsHk5BfdA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/plymouth-kcm-6.1.2.tar.xz", + "hash": "sha256-L5GzV+Ufh2bOZYtLUPq9y44eFotqRhW7znkHDTCJ3KU=" }, "polkit-kde-agent-1": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/polkit-kde-agent-1-6.1.1.tar.xz", - "hash": "sha256-H4tLoKEKAbzh+lTy0TpADnA612TeBMvLU20VOv0Xrpg=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/polkit-kde-agent-1-6.1.2.tar.xz", + "hash": "sha256-iJFt6obdUo/jZZ6cxzwlLkoPxYoueHCzriK1bWt1INc=" }, "powerdevil": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/powerdevil-6.1.1.tar.xz", - "hash": "sha256-SVB26QNmiYOZ9sL+4iotH+lphSSnxvLKzYL4yo1pnyc=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/powerdevil-6.1.2.tar.xz", + "hash": "sha256-1Ki4VTb2niI2l70cer0dw/woOnHFtcwJqRokfYXYUBQ=" }, "print-manager": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/print-manager-6.1.1.tar.xz", - "hash": "sha256-sRDyMcsvn5RPOveqaCIOHM/x4OV5Hk/xSVQTpFI9umY=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/print-manager-6.1.2.tar.xz", + "hash": "sha256-FBYVYc7UAP5uCmUnE+C4a0NLWlC69VMgwulJjkjD9aU=" }, "qqc2-breeze-style": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/qqc2-breeze-style-6.1.1.tar.xz", - "hash": "sha256-3i7dyPFyXS2753jOrgJfDDkO5UcxCgAOeD//E+AmqPw=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/qqc2-breeze-style-6.1.2.tar.xz", + "hash": "sha256-MkA66uAwdLz8b2/z0L7D//e5pOhj3Hpo354Vu33EHtk=" }, "sddm-kcm": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/sddm-kcm-6.1.1.tar.xz", - "hash": "sha256-B8CUtRCaOTdFqMiyj13+ZWueIuvr9b2zsoCSU7XeIHE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/sddm-kcm-6.1.2.tar.xz", + "hash": "sha256-bHiyAkIOPS1ZeiK5j24kAjU50PgG9c4J99zIPv50gNc=" }, "systemsettings": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/systemsettings-6.1.1.tar.xz", - "hash": "sha256-FTs5ru2DB7USV0lQCBQ6FUxs+mTTupKGBjmjFQuhpxE=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/systemsettings-6.1.2.tar.xz", + "hash": "sha256-kHrd7AuvQCbXdBoNszgNOI9c9pmE2sB8D6BeEQWLRrY=" }, "wacomtablet": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/wacomtablet-6.1.1.tar.xz", - "hash": "sha256-Jo/SZCP7oIXrciKU4+dXGYlh+mJ1qR5zgfq9gaODqIA=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/wacomtablet-6.1.2.tar.xz", + "hash": "sha256-fe4qU5mAqBCw7uXNjYO2/iuaKpDDa6cA0WuTj+zXVHE=" }, "xdg-desktop-portal-kde": { - "version": "6.1.1", - "url": "mirror://kde/stable/plasma/6.1.1/xdg-desktop-portal-kde-6.1.1.tar.xz", - "hash": "sha256-vIFULW/3kgRkOCd5CdQDE3/Vscr/oiNJvd0PFP9EKAQ=" + "version": "6.1.2", + "url": "mirror://kde/stable/plasma/6.1.2/xdg-desktop-portal-kde-6.1.2.tar.xz", + "hash": "sha256-udt1PIUwQ7GXaWRKqZ3qQTrR/2v8ao5osulwon+ZejY=" } -} +} \ No newline at end of file diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix index f396db7a33782..f5d6d9d8bc586 100644 --- a/pkgs/kde/misc/kdiagram/default.nix +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -16,5 +16,5 @@ mkKdeDerivation rec { extraNativeBuildInputs = [qttools qtsvg]; - meta.license = [lib.licenses.gpl2]; + meta.license = [lib.licenses.gpl2Only]; } diff --git a/pkgs/kde/plasma/kwallet-pam/default.nix b/pkgs/kde/plasma/kwallet-pam/default.nix index 4b3cdd678deea..a540f54a85ce8 100644 --- a/pkgs/kde/plasma/kwallet-pam/default.nix +++ b/pkgs/kde/plasma/kwallet-pam/default.nix @@ -1,6 +1,7 @@ { lib, mkKdeDerivation, + pkg-config, pam, libgcrypt, socat, @@ -12,5 +13,6 @@ mkKdeDerivation { sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; + extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [pam libgcrypt]; } diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix index 4b1e373ca69d3..ab981d1f38c0e 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -73,7 +73,7 @@ let meta = with lib; { homepage = "https://www.barebox.org"; description = "Swiss Army Knive for bare metal"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ emantor ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 1a3b4ebfbef69..75f5122cfd03a 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; homepage = "https://www.freedesktop.org/wiki/Software/cups-pk-helper/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index cce75b26d71e8..c0f4e1854379d 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { Lenovo M7605D ''; homepage = "https://github.com/pdewacht/brlaser"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; }; diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index 828b4bb831b62..de1d397f7b581 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -82,7 +82,7 @@ in rec { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; homepage = "http://www.brother.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.steveej ]; }; diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index 97dcbde2b8b52..c3186cafa264d 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "CUPS Linux drivers and SDK for DYMO printers"; homepage = "https://www.dymo.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index e0936b73b08a7..4bd6174b7ca52 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://onlinesupport.fujixerox.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ delan ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 767597548991a..c629a4918901d 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128"; maintainers = [ lib.maintainers.yochai ]; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4e6f37112087b..aead095635b39 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; - license = with licenses; gpl2; + license = with licenses; gpl2Plus; platforms = with platforms; linux; downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index f30f9abae3347..abf25ae69850e 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.xeji ]; }; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index 2cad0ceba55be..590c5c849c35f 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; homepage = "http://www.brother.com/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.Enzime ]; }; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index d3ae34a80ae58..fae7414d36188 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; homepage = "http://splix.ap2c.org"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index c1654782db265..127910f97aac6 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index e84cc3b0e3f88..5631a975e2e99 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ma9e ma27 shawn8901 ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 8004af7686e18..e2d5b8ec6a82b 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ghostscript and cups printer drivers"; homepage = "https://sourceforge.net/projects/gimp-print/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; isGutenprint = true; }; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index e7bfbe34ee7f3..9331760ef66bf 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { homepage = "https://github.com/donovan6000/M3D-Linux"; description = "Linux program that can communicate with the Micro 3D printer"; mainProgram = "m33-linux"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index e0cf96bd63aa1..2215c5d1d29e2 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { homepage = "https://github.com/Ryochan7/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ orivej rnhmjoj ]; }; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 4e7375a269168..428bb9685f47f 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.isDarwin; description = "JACK audio connection kit"; homepage = "https://jackaudio.org"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus lgpl21 ]; pkgConfigModules = [ "jack" ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/jackaudio/tools.nix b/pkgs/misc/jackaudio/tools.nix index ac14d1528ce4c..f299d3075c262 100644 --- a/pkgs/misc/jackaudio/tools.nix +++ b/pkgs/misc/jackaudio/tools.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation (final: { homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ pennae ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/misc/meson-tools/default.nix index 02b162c88098d..78e8549807917 100644 --- a/pkgs/misc/meson-tools/default.nix +++ b/pkgs/misc/meson-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/afaerber/meson-tools"; description = "Tools for Amlogic Meson ARM platforms"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 0f231bfd2f54c..435db1c380d25 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.36"; + version="1.38"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "sha256-hS/4d7HUCoulY73Sn1+IAb/IWD4VDht78Tn2jdluzhU="; + sha256 = "sha256-/0wua0rIpAQAq+ZgmQu/0vHGPgn7pNwAo1theTMG0PA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/misc/opcua-client-gui/default.nix b/pkgs/misc/opcua-client-gui/default.nix index 962d48be8f8e6..c53634a8b451f 100644 --- a/pkgs/misc/opcua-client-gui/default.nix +++ b/pkgs/misc/opcua-client-gui/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/FreeOpcUa/opcua-client-gui"; platforms = platforms.unix; license = licenses.gpl3Only; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "opcua-client"; }; } diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/misc/rkdeveloptool-pine64/default.nix index fbb1a2b725a57..1c53f6d664f26 100644 --- a/pkgs/misc/rkdeveloptool-pine64/default.nix +++ b/pkgs/misc/rkdeveloptool-pine64/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { { homepage = "https://gitlab.com/pine64-org/quartz-bsp/rkdeveloptool/"; description = "Tool from Rockchip to communicate with Rockusb devices (pine64 fork)"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ maintainers.adisbladis ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index 3b6a85764bfa3..dcbcfcf432c87 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; description = "Tool from Rockchip to communicate with Rockusb devices"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.lopsided98 ]; mainProgram = "rkdeveloptool"; }; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index f1ba5eb0f1e27..ef141c784d8d3 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { It relies on LightDM for locking and unlocking your session via ConsoleKit/UPower or logind/systemd. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index caae1a4ba2c01..993ec8447c3a4 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure suspend/hibernate-friendly alternative to `vlock -an`"; mainProgram = "physlock"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 3ec89194df872..f8e0479b36c2a 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { This package currently contains all of the screensavers from the original collection, plus a few others. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; } diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index c156373f14813..4596f707f344e 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Virtual console locking program"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ ]; platforms = platforms.linux; mainProgram = "vlock"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 90265afc4284e..c7934125a7aea 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.ibiblio.org/pub/linux/X11/screensavers"; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "xautolock"; }; }) diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index eba0b568b92a2..d99c9fd7fcff5 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screen locker for the X Window System"; homepage = "http://sillycycle.com/xlockmore.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 3b785dfc56647..1560af6d9967f 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; homepage = "https://www.hyperrealm.com/talkfilters/talkfilters.html"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ikervagyok ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 95fadc40da5fd..8a81b47d2574c 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -132,7 +132,7 @@ let meta = with lib; { homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bartsch dezgeg lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ])); diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index 3190cfb380d8e..9ff961454bf17 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Displays text on your screen"; homepage = "https://sourceforge.net/projects/libxosd"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index a49f1a305ce4a..1fefdbf7a8e6f 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.77.1"; + version = "1.78.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-+Itz6U1DHV9ZsgjzuvrfVtCJ1yiGSpVOkD28BmHibIQ="; + hash = "sha256-6DPScMbD746a6xtThze8Uthd33CLRjAC7Z9v751p+Eg="; }; dontPatch = true; diff --git a/pkgs/os-specific/darwin/swiftbar/default.nix b/pkgs/os-specific/darwin/swiftbar/default.nix index e9c45b7f9e077..4a12dc2dfea73 100644 --- a/pkgs/os-specific/darwin/swiftbar/default.nix +++ b/pkgs/os-specific/darwin/swiftbar/default.nix @@ -1,7 +1,8 @@ -{ lib -, fetchzip -, stdenvNoCC -, makeWrapper +{ + lib, + fetchzip, + stdenvNoCC, + makeWrapper, }: stdenvNoCC.mkDerivation rec { @@ -17,9 +18,7 @@ stdenvNoCC.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -41,6 +40,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; platforms = platforms.darwin; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matteopacini ]; }; } diff --git a/pkgs/os-specific/linux/decklink/default.nix b/pkgs/os-specific/linux/decklink/default.nix deleted file mode 100644 index a2811ddae8a57..0000000000000 --- a/pkgs/os-specific/linux/decklink/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv -, lib -, fetchpatch -, blackmagic-desktop-video -, kernel -}: - -stdenv.mkDerivation rec { - pname = "decklink"; - - # the download is a horrible curl mess. we reuse it between the kernel module - # and desktop service, since the version of the two have to match anyways. - # See pkgs/tools/video/blackmagic-desktop-video/default.nix for more. - inherit (blackmagic-desktop-video) src version; - - KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = placeholder "out"; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - patches = lib.optionals (lib.versionAtLeast kernel.version "6.8") [ - (fetchpatch { - name = "decklink-addMutex.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/01-addMutex.patch?h=decklink&id=132ce45a76e230cbfec4a3daac237ffe9b8a377a"; - sha256 = "sha256-YLIjO3wMrMoEZwMX5Fs9W4uRu9Xo8klzsjfhxS2wRfQ="; - }) - (fetchpatch { - name = "decklink-changeMaxOrder.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/02-changeMaxOrder.patch?h=decklink&id=132ce45a76e230cbfec4a3daac237ffe9b8a377a"; - sha256 = "sha256-/erUVYjpTuyaQaCSzSxwKgNocxijc1uNaUjnrJEMa6g="; - }) - ]; - - - postUnpack = let - arch = stdenv.hostPlatform.uname.processor; - in '' - tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" version)}/other/${arch}/desktopvideo-${version}-${arch}.tar.gz - moduleRoot=$NIX_BUILD_TOP/desktopvideo-${version}-${stdenv.hostPlatform.uname.processor}/usr/src - sourceRoot=$moduleRoot - ''; - - - buildPhase = '' - runHook preBuild - - make -C $moduleRoot/blackmagic-${version} -j$NIX_BUILD_CORES - make -C $moduleRoot/blackmagic-io-${version} -j$NIX_BUILD_CORES - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - make -C $KERNELDIR M=$moduleRoot/blackmagic-${version} modules_install - make -C $KERNELDIR M=$moduleRoot/blackmagic-io-${version} modules_install - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback"; - maintainers = [ maintainers.hexchen ]; - license = licenses.unfree; - description = "Kernel module for the Blackmagic Design Decklink cards"; - sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/os-specific/linux/dracut/default.nix index 498f61dc9836e..39fc54d2a2c4b 100644 --- a/pkgs/os-specific/linux/dracut/default.nix +++ b/pkgs/os-specific/linux/dracut/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dracutdevs/dracut/wiki"; description = "Event driven initramfs infrastructure"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index b23e0d34401a9..db106c14b434a 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -1,32 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, perl, makeWrapper +{ lib, stdenv, fetchFromGitHub, perl , sysfsutils, dmidecode, kmod }: stdenv.mkDerivation { pname = "edac-utils"; - version = "unstable-2015-01-07"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "grondo"; repo = "edac-utils"; - rev = "f9aa96205f610de39a79ff43c7478b7ef02e3138"; - sha256 = "1dmfqb15ffldl5zirbmwiqzpxbcc2ny9rpfvxcfvpmh5b69knvdg"; + rev = "8fdc1d40e30f65737fef6c3ddcd1d2cd769f6277"; + hash = "sha256-jZGRrZ1sa4x0/TBJ5GsNVuWakmPNOU+oiOoXdhARunk="; }; - nativeBuildInputs = [ perl makeWrapper ]; - buildInputs = [ sysfsutils ]; + # Hard-code program paths instead of using PATH lookups. Also, labels.d and + # mainboard are for user-configurable data, so do not look for them in Nix + # store. + dmidecodeProgram = lib.getExe' dmidecode "dmidecode"; + modprobeProgram = lib.getExe' kmod "modprobe"; + postPatch = '' + substituteInPlace src/util/edac-ctl.in \ + --replace-fail 'find_prog ("dmidecode")' "\"$dmidecodeProgram\"" \ + --replace-fail 'find_prog ("modprobe") or exit (1)' "\"$modprobeProgram\"" \ + --replace-fail '"$sysconfdir/edac/labels.d"' '"/etc/edac/labels.d"' \ + --replace-fail '"$sysconfdir/edac/mainboard"' '"/etc/edac/mainboard"' + ''; - configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - ]; + # NB edac-utils needs Perl for configure script, but also edac-ctl program is + # a Perl script. Perl from buildInputs is used by patchShebangsAuto in + # fixupPhase to update the hash bang line. + strictDeps = true; + nativeBuildInputs = [ perl ]; + buildInputs = [ perl sysfsutils ]; installFlags = [ - "sysconfdir=\${out}/etc" + "sbindir=${placeholder "out"}/bin" ]; + # SysV init script is not relevant. postInstall = '' - wrapProgram "$out/sbin/edac-ctl" \ - --set PATH ${lib.makeBinPath [ dmidecode kmod ]} + rm -r "$out"/etc/init.d ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 94a5a43b76e19..20a2b43143de5 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.21"; + version = "7.22"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-4sbOT886yziTyl01yGk1+ArXb8XMrmARhYQt92DgvGk="; + sha256 = "sha256-9qxaR8Pvn0xn/L31Xnkcv+OOsKSqG6rNEmRqFAq6zdk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index b2c4d0a6a6695..c2f7ef4447b7f 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.33"; - hash = "sha256-3qGxIYNVm2f69rym0Ya1X497G7yRNj3lLCtVgyEZ9yw="; + version = "6.6.36"; + hash = "sha256-8L8e5iP4pvIvgqHmQYhFRCbgLvuFOXr7nkBe0VnuCzw="; variant = "lts"; }; mainVariant = { - version = "6.9.4"; - hash = "sha256-gY0t77aPWOuRZFESNp0OLIsjLAv+rf0NHbab9WF2VtA="; + version = "6.9.7"; + hash = "sha256-hmVcwC1PHjyCw43IpJ99y72qFXSX5lbbh6+1TqdXzag="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/os-specific/linux/libzbc/default.nix index e2da36d9dc793..7bee9500429eb 100644 --- a/pkgs/os-specific/linux/libzbc/default.nix +++ b/pkgs/os-specific/linux/libzbc/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libzbc"; - version = "5.14.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "westerndigitalcorporation"; repo = "libzbc"; rev = "v${version}"; - sha256 = "sha256-+MBk2ZUr3Vt6pZFb4gTXMOzKBlf1EXMF8y/c1iDrIZM="; + sha256 = "sha256-5VqFTtWZJBP+uUKru46KKPSO+2Nh4EU4AmrA20czZOc="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index de215024555d8..23f79e7f66536 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -1,17 +1,21 @@ -{ lib, stdenv, fetchurl, linuxHeaders } : +{ lib, stdenv, fetchFromGitHub, linuxHeaders } : stdenv.mkDerivation rec { pname = "linuxptp"; - version = "4.2"; + version = "4.3"; - src = fetchurl { - url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - hash = "sha256-cOOOXSdk4CF0Q9pvFOiEb+QBpHIpOsE42EGcB6ZlRHo="; + src = fetchFromGitHub { + owner = "nwtime"; + repo = "linuxptp"; + rev = "v${version}"; + hash = "sha256-FFBbbmVPP74p/OkqNXXgynBS/NcuPoYs3OCof11NZOI="; }; + outputs = [ "out" "man" ]; + postPatch = '' - substituteInPlace incdefs.sh --replace \ + substituteInPlace incdefs.sh --replace-fail \ '/usr/include/linux/' "${linuxHeaders}/include/linux/" ''; @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; - homepage = "https://linuxptp.sourceforge.net/"; + homepage = "https://linuxptp.nwtime.org"; maintainers = [ maintainers.markuskowa ]; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index aa614aec12839..dea9ab721a957 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -217,8 +217,10 @@ installPhase() { --set-rpath $out/lib:$libPath $bin/bin/$i fi done - # FIXME: needs PATH and other fixes - # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh + substituteInPlace nvidia-bug-report.sh \ + --replace /bin/grep grep \ + --replace /bin/ls ls + install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh fi runHook postInstall diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index c6aa391fce863..fe2e9951bf855 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -42,12 +42,12 @@ rec { }; latest = selectHighestVersion production (generic { - version = "555.58"; - sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew="; - sha256_aarch64 = "sha256-7XswQwW1iFP4ji5mbRQ6PVEhD4SGWpjUJe1o8zoXYRE="; - openSha256 = "sha256-hEAmFISMuXm8tbsrB+WiUcEFuSGRNZ37aKWvf0WJ2/c="; - settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M="; - persistencedSha256 = "sha256-lyYxDuGDTMdGxX3CaiWUh1IQuQlkI2hPEs5LI20vEVw="; + version = "555.58.02"; + sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; + sha256_aarch64 = "sha256-wb20isMrRg8PeQBU96lWJzBMkjfySAUaqt4EgZnhyF8="; + openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY="; + settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; + persistencedSha256 = "sha256-a1D7ZZmcKFWfPjjH1REqPM5j/YLWKnbkP9qfRyIyxAw="; }); beta = selectHighestVersion latest (generic { @@ -62,11 +62,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.63"; + version = "550.40.65"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-YvlNgxcFsCl3DzHFpKe+VXzfc0QIgf3N/hTKsWZ7gDE="; - openSha256 = "sha256-mITh1kdSPtB+jP6TDHw04EN7gRx48KGbzbLO0wTSS/U="; + sha256_64bit = "sha256-du86GHMBxzUkrP+nDzModBdxH3d1TueLPH5KeYSNKYU="; + openSha256 = "sha256-REBOh5bW7vUXa0sIGWddahPd1SR3GwBN4nmpv+m4Tak="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index d646f004893c2..bba3843f4f4c5 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,5 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, gnome +, wrapGAppsHook3, gtk3, glib, desktop-file-utils, appstream-glib, adwaita-icon-theme , gobject-introspection, librsvg }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook3 desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 glib gnome.adwaita-icon-theme python3 librsvg + gtk3 glib adwaita-icon-theme python3 librsvg ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index f7145bc02ebe7..be984c5648607 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -127,6 +127,6 @@ stdenv.mkDerivation rec { mainProgram = "powerprofilesctl"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mvnetbiz picnoir ]; + maintainers = with maintainers; [ mvnetbiz picnoir lyndeno ]; }; } diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index b8dfd36d5919c..f14595d655be4 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromSourcehut, rustPlatform, nix-update-script }: -let version = "0.5.0"; +let version = "0.5.1"; in rustPlatform.buildRustPackage { pname = "sd-switch"; inherit version; @@ -9,10 +9,10 @@ in rustPlatform.buildRustPackage { owner = "~rycee"; repo = "sd-switch"; rev = version; - hash = "sha256-TESS+CwwEugAz+grzndunAoKF9Or/Jl7tftL392fUaM="; + hash = "sha256-Kns49Qv3oWNmbLoLTKIcWIewDz4cR7uyMA3IHnhKyxA="; }; - cargoHash = "sha256-QEnleFwEIoKATupj0sSV/GUztQoozEsb3SEgnfFzAfw="; + cargoHash = "sha256-r20dJMF+0q3XLm2hn9/LTv43ApmhjJNgeiMCLfwBnOk="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/os-specific/linux/system76-power/default.nix b/pkgs/os-specific/linux/system76-power/default.nix index 6a5456080f593..0dba9894d23e6 100644 --- a/pkgs/os-specific/linux/system76-power/default.nix +++ b/pkgs/os-specific/linux/system76-power/default.nix @@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pop-os/system76-power"; license = licenses.gpl3Plus; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ maintainers.jwoudenberg ]; + maintainers = []; }; } diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 28ef35a917a1c..f478c1e4c83a4 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -81,7 +81,7 @@ buildGoModule rec { description = "Looking-glass for BGP sessions"; changelog = "https://github.com/alice-lg/alice-lg/blob/main/CHANGELOG.md"; license = licenses.bsd3; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "alice-lg"; }; } diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix index 48ba580e1346d..57840e526884d 100644 --- a/pkgs/servers/birdwatcher/default.nix +++ b/pkgs/servers/birdwatcher/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { description = "Small HTTP server meant to provide an API defined by Barry O'Donovan's birds-eye to the BIRD internet routing daemon"; changelog = "https://github.com/alice-lg/birdwatcher/blob/master/CHANGELOG"; license = licenses.bsd3; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "birdwatcher"; }; } diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 65379131afcc2..b4e6b4758ab59 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "23.1.1"; + version = "24.0.0"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "sha256-xmWFRqdGUk+9MKd9cQLquOmike3soNRgPwQ+F27MSAQ="; + sha256 = "sha256-vKn1dTP1SOQs9oCPw0R5956D6mR5UuW9GbqGilxeV3c="; }; - vendorHash = "sha256-YRfFRCCm25zS+tQer6UcrBBltOxA7+Iqi+Ejyrjdu/A="; + vendorHash = "sha256-/Wpnj99yHyEc7uPBo00k6lJawX5HqqVwEHavyH3luaY="; doCheck = false; diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index f878ef6e64e92..dbeb936825516 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-HAxZaZofO24baPTNFqSltNgZekjOLRuCprcAksTSYiY="; + sha256 = "sha256-7VpalDKa2Qr3HaIO5LcORvm5rAhgYQzStQkp7rs3pMQ="; }; # don't do anything? diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix index 85bef161595e0..136c36010442d 100644 --- a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix +++ b/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "epex_spot"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "mampfes"; repo = "ha_epex_spot"; rev = "refs/tags/${version}"; - hash = "sha256-8cxEOCzlQbS3HbQMBo7/rZb/GfpJvOWayLttEaEENYs="; + hash = "sha256-BwNDI2OMF6bXqFcdr0AJgj9Gb6Uz8BWOfE7M4jqzQJc="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix index a134f8ff4f140..40601bef0e2ca 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; rev = "refs/tags/${version}"; - hash = "sha256-utxCHXVpP4FQT2poVuS4cMZGgn7yO89lUw5KhIHRXKQ="; + hash = "sha256-e1Bdhv6YSz9yhIx5SDKfRxq0f6Fr0oc0vzpOqPPMxmc="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index c9e6ec815d3a0..c214fe1270adc 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -8,12 +8,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.5.2"; + version = "1.6.0"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-jX0WBIdL3RQpgdeVf4oZByDNKQbrEjKbImC86Ceqkoc="; + hash = "sha256-yzEbYOxvt2SPTYD/Dw4SJDg94muKGan+QX51sf6xuU4="; }; configureFlags = lib.optionals withAcme [ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index b3d499415dde4..44b2caa184f4b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.59"; + version = "2.4.61"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - hash = "sha256-7FFQHsSAKE/1L2NyWBNdMzIwp9Ipw6+m9sL5BA4yEyM="; + hash = "sha256-6ouob9lb1ZTRXkbSWsW72oKuDJEirZOZjMU5wTPqzrY="; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix index 20879d4aaf21b..22a50ea8feb67 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - pname = "tomcat-connectors"; - version = "1.2.48"; + pname = "mod_jk"; + version = "1.2.49"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz"; - sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb"; + url = "mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-${version}-src.tar.gz"; + hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw="; }; configureFlags = [ @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides web server plugins to connect web servers with Tomcat"; homepage = "https://tomcat.apache.org/download-connectors.cgi"; + changelog = "https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html"; license = licenses.asl20; + maintainers = with maintainers; [ anthonyroussel ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 2ea00c598e276..b33eb921ef368 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -24,9 +24,9 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.30.3"; - rev = "12a6a79966203969a23aa2f0d705f39b679744c2"; - hash = "sha256-S18bnAVha4CnYKHTzytKY6PHWSbOzmObbyZEhzIHsf8="; + version = "1.30.4"; + rev = "32113313a357829ba3a5dce0795b6780bf8cbf4d"; + hash = "sha256-u9lTVe40pwXTt0YRwJXRuZonS5KJL2JQUQ3L9ymuA74="; }; # these need to be updated for any changes to fetchAttrs @@ -184,6 +184,8 @@ buildBazelPackage { "--repo_env=GOSUMDB=sum.golang.org" ]; + requiredSystemFeatures = [ "big-parallel" ]; + passthru.tests = { envoy = nixosTests.envoy; # tested as a core component of Pomerium diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index f4a9277a332fa..adf60cdf32e4e 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiawatha"; - version = "11.5"; + version = "11.6"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${finalAttrs.version}"; - hash = "sha256-kswVBVL/QUQmCwH74qWwSwLz4uwDymuHIr8NokrrgEM="; + hash = "sha256-YsZdVqanVNibA4KnAknLh61hVo7x5uu67lb+RX2N7c8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index bd8873ce100e7..8e78b8f07287e 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -13,15 +13,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-AkpfLKPirl8fz4s0hQI15aSgI2PZFPakAzC+j66MVY0="; + hash = "sha256-lMI6dVCTInqHsz4N0HsOVUQo8TkheAwr54FW46r+DUA="; }; - vendorHash = "sha256-kabWL7yqNkI2JRPmVv0tp0nIfVDwT9QbbDIbdM8sL5s="; + vendorHash = "sha256-AHlnhAh4RBz8aJoFJjbX/MUDHq81xK7b7gvCyuV3gjU="; ui = mkYarnPackage { inherit version; diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index f915db2073d56..67673bb1efba8 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "router"; - version = "1.49.1"; + version = "1.50.0"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - hash = "sha256-Dhl8CKXMeiZ38hDbNviKBzg6zmCpO2wJFWHHZbJXJWI="; + hash = "sha256-Inah2IcmWSyizsavXr2N5j2S2eAfocpxzjrAdhQlfjg="; }; - cargoHash = "sha256-FbIUvjm1tYMbsWdwu78drUQuMjcl6Ju/pPV9pmWHcf4="; + cargoHash = "sha256-G4HjvVGRbgOteZvC1tt75HP+EJDGEkndVhADBm8B1C8="; nativeBuildInputs = [ cmake diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index a705ed4483a01..1744361f8412d 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ergo"; - version = "2.13.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "ergochat"; repo = "ergo"; rev = "v${version}"; - sha256 = "sha256-WQvXrG82hcPd4viA1cyIsTd5HbR0KD1b5r2me8MKoR8="; + sha256 = "sha256-vXspI0BkwpS9w7PQpj+U3REQcSPaPJAfIBRj62loQzQ="; }; vendorHash = null; diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index 578c9aa314413..dd821ce119591 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -145,13 +145,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.17.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-isLZKYf32+va66FGYMq4mWIEHNpqUWCcVhYWLA5lRwk="; + sha256 = "sha256-4jtIh6wpZ/rexnwhqicU1gUk6DerGLXM9OY+GkmiEnI="; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; diff --git a/pkgs/servers/jellyseerr/default.nix b/pkgs/servers/jellyseerr/default.nix index b469e46cf10d8..e0c5accca2ce5 100644 --- a/pkgs/servers/jellyseerr/default.nix +++ b/pkgs/servers/jellyseerr/default.nix @@ -11,20 +11,20 @@ mkYarnPackage rec { pname = "jellyseerr"; - version = "1.8.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; rev = "v${version}"; - hash = "sha256-B8Hnpi4XwK0WrHRgj7OSVUh49oRH9SVEHdzGbnDa8p8="; + hash = "sha256-TXe/k/pb7idu7G1wGu6TZksnoFQ5/PN0voVlve3k1UI="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-ME19kHlVw0Q5oCytYQCUj4Ek0+712NkqB6eozOtF6/k="; + hash = "sha256-2iRxguxEI+YKm8ddhRgZMvfZuUgQmCK5ER4jMCFJQMQ="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/jellyseerr/package.json b/pkgs/servers/jellyseerr/package.json index 39613efb5fad5..6e97347f75b7b 100644 --- a/pkgs/servers/jellyseerr/package.json +++ b/pkgs/servers/jellyseerr/package.json @@ -1,6 +1,6 @@ { "name": "jellyseerr", - "version": "1.8.1", + "version": "1.9.2", "private": true, "scripts": { "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts", @@ -44,6 +44,7 @@ "axios-rate-limit": "1.3.0", "bcrypt": "5.1.0", "bowser": "2.11.0", + "cacheable-lookup": "^7.0.0", "connect-typeorm": "1.1.4", "cookie-parser": "1.4.6", "copy-to-clipboard": "3.3.3", diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index 0f27b36be5227..a8847215d65cb 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-J/QChAFjcUdtrfs5KUIRwfJdfCB/gRnIUNyinf66Slo="; + hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk="; }; - cargoHash = "sha256-Cwrgdo+mirH3kGXwBgCzeO1xiEhSrt/Fx8LxhaBJJLE="; + cargoHash = "sha256-Z12fUK4TUgk38/vNAt8RWLFGLc8WnZAgHWz0xl1QKLI="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index c49f606c8fd7c..0658b7a36fedb 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -53,6 +53,16 @@ stdenv.mkDerivation rec { url = "https://github.com/389ds/389-ds-base/commit/1fe029c495cc9f069c989cfbb09d449a078c56e2.patch"; hash = "sha256-b0HSaDjuEUKERIXKg8np+lZDdZNmrCTAXybJzF+0hq0="; }) + (fetchpatch { + name = "CVE-2024-2199.patch"; + url = "https://git.rockylinux.org/staging/rpms/389-ds-base/-/raw/dae373bd6b4e7d6f35a096e6f27be1c3bf1e48ac/SOURCES/0004-CVE-2024-2199.patch"; + hash = "sha256-grANphTafCoa9NQy+FowwPhGQnvuCbfGnSpQ1Wp69Vg="; + }) + (fetchpatch { + name = "CVE-2024-3657.patch"; + url = "https://git.rockylinux.org/staging/rpms/389-ds-base/-/raw/dae373bd6b4e7d6f35a096e6f27be1c3bf1e48ac/SOURCES/0005-CVE-2024-3657.patch"; + hash = "sha256-CuiCXQp3PMiYERzFk7oH3T91yQ1dP/gtLNWF0eqGAQ4="; + }) ]; cargoDeps = rustPlatform.fetchCargoTarball { diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index fb63c5e3376cd..4fa70976e8554 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests }: +{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, chromaprint, makeWrapper, icu, dotnet-runtime, openssl, nixosTests, zlib }: let os = if stdenv.isDarwin then "osx" else "linux"; @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-tc7ODqFifTI7+FhCNmUBAv0s324T4yH4AHIVy64N3/I="; - arm64-linux_hash = "sha256-hmS7m1w07n+1+Eia+hA8oK8fJr+lWyqVq1FGjyRYwaQ="; - x64-osx_hash = "sha256-+t3cEFlk5Agkb14hx1H3WQfpKniJkPImWoRn6swuoOE="; + x64-linux_hash = "sha256-ulWg9BhDr/RFE4sfXGf+i9W0KpOYKjtk49qBeIwI9dU="; + arm64-linux_hash = "sha256-iSXXx89I7Pj2nAuapHwJtIblj+TDrd/k9OiBK8QExSg="; + x64-osx_hash = "sha256-xjnDePaxQWRNo1VmH1sbp0Xtvbac3nu0+fiMg0wMddg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.2.5.4141"; + version = "2.3.3.4204"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { makeWrapper "${dotnet-runtime}/bin/dotnet" $out/bin/Lidarr \ --add-flags "$out/share/${pname}-${version}/Lidarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ - curl sqlite libmediainfo icu openssl ]} + curl sqlite libmediainfo icu openssl zlib ]} runHook postInstall ''; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 01d92fdde0a98..e2e04e6dde360 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-06-22T05-26-45Z"; + version = "2024-06-28T09-06-49Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-r5T6e2Wzb0uJ7VI6fIHxswkGPi1MsGSj4sC225PQb+o="; + hash = "sha256-txCLzA65VOjOVD6SExefXKUMbD7WeXT9a9LNwoA4reU="; }; - vendorHash = "sha256-AK6PGX/ezkN/LAnOLd8fRGkzwhTE4BY63H9ebnXxEOA="; + vendorHash = "sha256-KDHmLRmnbfGiS4ZeT4CZlzOkxv9GXyNfFYzSXfylLIg="; doCheck = false; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index abc04b539558b..05cdfec4278ff 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.27.0"; + version = "3.28.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-RxBAnElmQkrkMuIC0UpneJXN1OiPhaTPm/tYvc8QSg8="; + hash = "sha256-HdGRZrMukIQLxTmwTVB/zUlnrhDjq5b6ree7aqx8pRE="; }; vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A="; diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 027235986c5e0..a7d1374493c1a 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-qHrgNuPDEtFzucE6ACPemUcjEqOvbo4xV0ru4bP3ATE="; + sha256 = "sha256-dgGdSnMsz/6dggZXh5crwHEoVVIlcUIHMH5MSOO29TE="; }; separateDebugInfo = true; - cargoHash = "sha256-BVl4Inr7ZLnilkPVTD2cjJx9RuqB0Mg230o2c2TLw3I="; + cargoHash = "sha256-u7mzViTc0f4vApmmRNl6NkJlMfKeWSO0yupBt6adiag="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 927a011ded284..ad285956866a4 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -3,26 +3,22 @@ , yarn, nodejs, python3, cacert , jq, moreutils , nix-update-script, nixosTests, xcbuild -, util-linux +, faketty }: let - # We need dev dependencies to run webpack, but patch away - # `cypress` (and @grafana/e2e which has a direct dependency on cypress). - # This attempts to download random blobs from the Internet in - # postInstall. Also, it's just a testing framework, so not worth the hassle. - patchAwayGrafanaE2E = '' - find . -name package.json | while IFS=$'\n' read -r pkg_json; do - <"$pkg_json" jq '. + { - "devDependencies": .devDependencies | del(."@grafana/e2e") | del(.cypress) - }' | sponge "$pkg_json" - done - rm -r packages/grafana-e2e + # Grafana seems to just set it to the latest version available + # nowadays. + patchGoVersion = '' + substituteInPlace go.{mod,work} pkg/build/wire/go.mod \ + --replace-fail "go 1.22.4" "go 1.22.3" + substituteInPlace Makefile \ + --replace-fail "GO_VERSION = 1.22.4" "GO_VERSION = 1.22.3" ''; in buildGoModule rec { pname = "grafana"; - version = "11.0.0"; + version = "11.1.0"; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; @@ -30,11 +26,13 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-cC1dpgb8IiyPIqlVvn8Qi1l7j6lLtQF+BOOO+DQCp4E="; + hash = "sha256-iTTT10YN8jBT4/ukGXNK1QHcyzXnAqg2LiFtNiwnENw="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + env = { + CYPRESS_INSTALL_BINARY = 0; + } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { # Fix error: no member named 'aligned_alloc' in the global namespace. # Occurs while building @esfx/equatable@npm:1.0.2 on x86_64-darwin NIX_CFLAGS_COMPILE = "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1"; @@ -49,7 +47,7 @@ buildGoModule rec { # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; postPatch = '' - ${patchAwayGrafanaE2E} + ${patchGoVersion} ''; buildPhase = '' runHook preBuild @@ -66,23 +64,24 @@ buildGoModule rec { dontFixup = true; outputHashMode = "recursive"; outputHash = rec { - x86_64-linux = "sha256-+Udq8oQSIAHku55VKnrfgHHevzBels0QiOZwnwuts8k="; + x86_64-linux = "sha256-2VnhZBWLdYQhqKCxM63fCAwQXN4Zrh2wCdPBLCCUuvg="; aarch64-linux = x86_64-linux; - aarch64-darwin = "sha256-m3jtZNz0J2nZwFHXVp3ApgDfnGBOJvFeUpqOPQqv200="; + aarch64-darwin = "sha256-MZE3/PHynL6SHOxJgOG41pi2X8XeutruAOyUFY9Lmsc="; x86_64-darwin = aarch64-darwin; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-kcdW6RQghyAOZUDmIo9G6YBC+YaLHdafvj+fCd+dcDE="; + vendorHash = "sha256-Ny/SoelFVPvBBn50QpHcLTuVY3ynKbCegM1uQkJzB9Y="; proxyVendor = true; - nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; + nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; postPatch = '' - ${patchAwayGrafanaE2E} + ${patchGoVersion} ''; postConfigure = '' @@ -115,7 +114,7 @@ buildGoModule rec { # After having built all the Go code, run the JS builders now. # Workaround for https://github.com/nrwl/nx/issues/22445 - ${util-linux}/bin/script -c 'yarn run build' /dev/null + faketty yarn run build yarn run plugins:build-bundled ''; @@ -156,8 +155,5 @@ buildGoModule rec { maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; mainProgram = "grafana-server"; - # requires util-linux to work around https://github.com/nrwl/nx/issues/22445 - # `script` doesn't seem to be part of util-linux on Darwin though. - broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 6919285554955..5deb6180704ff 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.31.0"; + version = "1.31.1"; subPackages = [ "cmd/telegraf" ]; @@ -17,10 +17,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-bnto39X/Mn8M5YbdM8JSoEPGCb5+UpHS6FPc5Q0kprE="; + hash = "sha256-itZPLiD6XQ6OwXsVrreWM7W268aLc8cz3hqXLdZryAU="; }; - vendorHash = "sha256-uyZZnEdAfkCYtgyjgPTLt463kcfdNczOruHaVmA+VIk="; + vendorHash = "sha256-zhGxla5SQcpwAUzaeG54Sdos3fpJ3zO+ymanLpZtmyg="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 64be3b1f5f90b..537fe93e01c54 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -10,8 +10,8 @@ let in buildMongoDB { inherit avxSupport; - version = "6.0.15"; - sha256 = "sha256-DX1wbrDx1/JrEHbzNaXC4Hqq7MrLqz+JZgG98beyVds="; + version = "6.0.16"; + sha256 = "sha256-DdMWacJTx6sxgIKG2M8DkboSBr0fD2w91M+ZYt75hQI="; patches = [ # Patches a bug that it couldn't build MongoDB 6.0 on gcc 13 because a include in ctype.h was missing ./fix-gcc-13-ctype-6_0.patch diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 30317fdb3b938..f4b375a62cc1b 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.20.0"; + version = "5.21.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-IDIVdIQCcChx5RHG3/88Yvclh8ToDfcDv4VAhcQ20GY="; + hash = "sha256-NFGoUqmG8VArQqx0p8qDUgvbtRnYbk1MYPSQ5CUFexg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/osmocom/libasn1c/default.nix b/pkgs/servers/osmocom/libasn1c/default.nix index a7d6f69f12068..c86475c69b85f 100644 --- a/pkgs/servers/osmocom/libasn1c/default.nix +++ b/pkgs/servers/osmocom/libasn1c/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/osmocom/libasn1c/"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/osmocom/libosmo-netif/default.nix b/pkgs/servers/osmocom/libosmo-netif/default.nix index 256fdeee4148b..440050cc2cdb7 100644 --- a/pkgs/servers/osmocom/libosmo-netif/default.nix +++ b/pkgs/servers/osmocom/libosmo-netif/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ - janik markuskowa ]; }; diff --git a/pkgs/servers/osmocom/libosmo-sccp/default.nix b/pkgs/servers/osmocom/libosmo-sccp/default.nix index bf814576c1640..b4f6091cdacc8 100644 --- a/pkgs/servers/osmocom/libosmo-sccp/default.nix +++ b/pkgs/servers/osmocom/libosmo-sccp/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ - janik markuskowa ]; }; diff --git a/pkgs/servers/osmocom/libosmoabis/default.nix b/pkgs/servers/osmocom/libosmoabis/default.nix index 6de87da1dc8dd..9a48278786bd0 100644 --- a/pkgs/servers/osmocom/libosmoabis/default.nix +++ b/pkgs/servers/osmocom/libosmoabis/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ - janik markuskowa ]; }; diff --git a/pkgs/servers/osmocom/libosmocore/default.nix b/pkgs/servers/osmocom/libosmocore/default.nix index 770dcd97f0a4c..af000b142df56 100644 --- a/pkgs/servers/osmocom/libosmocore/default.nix +++ b/pkgs/servers/osmocom/libosmocore/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mog - janik ]; }; } diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/servers/osmocom/osmo-bsc/default.nix index 1df6e7dd4c3be..eab88ea99cb06 100644 --- a/pkgs/servers/osmocom/osmo-bsc/default.nix +++ b/pkgs/servers/osmocom/osmo-bsc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "GSM Base Station Controller"; homepage = "https://projects.osmocom.org/projects/osmobsc"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-bsc"; }; diff --git a/pkgs/servers/osmocom/osmo-bts/default.nix b/pkgs/servers/osmocom/osmo-bts/default.nix index 42a214f7ce45b..1484c07f62e0f 100644 --- a/pkgs/servers/osmocom/osmo-bts/default.nix +++ b/pkgs/servers/osmocom/osmo-bts/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Osmocom GSM Base Transceiver Station (BTS)"; homepage = "https://osmocom.org/projects/osmobts"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/servers/osmocom/osmo-ggsn/default.nix index 51615fdb1b3ce..3c1cac479bb21 100644 --- a/pkgs/servers/osmocom/osmo-ggsn/default.nix +++ b/pkgs/servers/osmocom/osmo-ggsn/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Osmocom Gateway GPRS Support Node (GGSN), successor of OpenGGSN"; homepage = "https://osmocom.org/projects/openggsn"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-ggsn"; }; diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/servers/osmocom/osmo-hlr/default.nix index 112e3c8739029..a8e017fabcb13 100644 --- a/pkgs/servers/osmocom/osmo-hlr/default.nix +++ b/pkgs/servers/osmocom/osmo-hlr/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Osmocom implementation of 3GPP Home Location Registr (HLR)"; homepage = "https://osmocom.org/projects/osmo-hlr"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-hlr"; }; diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/servers/osmocom/osmo-hnbgw/default.nix index 30f0923073cbd..7d9b8c54ff4b2 100644 --- a/pkgs/servers/osmocom/osmo-hnbgw/default.nix +++ b/pkgs/servers/osmocom/osmo-hnbgw/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-hnbgw"; homepage = "https://osmocom.org/projects/osmohnbgw"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/servers/osmocom/osmo-hnodeb/default.nix index 95dd6bf72b702..b187ddd4f55de 100644 --- a/pkgs/servers/osmocom/osmo-hnodeb/default.nix +++ b/pkgs/servers/osmocom/osmo-hnodeb/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-hnodeb"; homepage = "https://osmocom.org/projects/osmo-hnodeb"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/servers/osmocom/osmo-iuh/default.nix index 56a94efbb02c7..a5653a31c9442 100644 --- a/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Osmocom IuH library"; homepage = "https://osmocom.org/projects/osmohnbgw/wiki"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-mgw/default.nix b/pkgs/servers/osmocom/osmo-mgw/default.nix index 939f062a7b4fc..92986952378ee 100644 --- a/pkgs/servers/osmocom/osmo-mgw/default.nix +++ b/pkgs/servers/osmocom/osmo-mgw/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-mgw"; homepage = "https://osmocom.org/projects/osmo-mgw"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/servers/osmocom/osmo-msc/default.nix index da6e719707ef1..de73eb980bbf7 100644 --- a/pkgs/servers/osmocom/osmo-msc/default.nix +++ b/pkgs/servers/osmocom/osmo-msc/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-msc"; homepage = "https://osmocom.org/projects/osmomsc/wiki"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/servers/osmocom/osmo-pcu/default.nix index 13b34b67b3336..1d079d3a8c040 100644 --- a/pkgs/servers/osmocom/osmo-pcu/default.nix +++ b/pkgs/servers/osmocom/osmo-pcu/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-pcu"; homepage = "https://osmocom.org/projects/osmopcu"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/servers/osmocom/osmo-sgsn/default.nix index 9529c4f50cad7..0bcd2218a59cf 100644 --- a/pkgs/servers/osmocom/osmo-sgsn/default.nix +++ b/pkgs/servers/osmocom/osmo-sgsn/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Osmocom implementation of the 3GPP Serving GPRS Support Node (SGSN)"; homepage = "https://osmocom.org/projects/osmosgsn"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "osmo-sgsn"; }; diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/servers/osmocom/osmo-sip-connector/default.nix index 0a5ab9ab9fd5f..77e4b8df3c5bf 100644 --- a/pkgs/servers/osmocom/osmo-sip-connector/default.nix +++ b/pkgs/servers/osmocom/osmo-sip-connector/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mainProgram = "osmo-sip-connector"; homepage = "https://osmocom.org/projects/osmo-sip-conector"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 5fbbf1752184c..61b867b653329 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-Scv4gXZZBujz/lq4QphH7rCQxTS7JT9wHpG4qsPK1mA="; - aarch64-linux = "sha256-fEDXNUrhSpheBFis7OdK4+fvpvm4+D4ulM/+h5erZLA="; - x86_64-darwin = "sha256-dgPuqclFQp/fOEIY32rlIqZIYbDzRbgHiYJRoICYWhg="; - x86_64-linux = "sha256-c89EiThP2LgkaeDxx01rQTtFZGcXvpMgo6yp+VViJO0="; + aarch64-darwin = "sha256-4bzeHU52XNAZW24P6uKQ0etUCW7dIsVpujrilPrI3hM="; + aarch64-linux = "sha256-0IpayOFTxhdbz7R3PhbTsdweMdDyY6J5WJ8JX/6aFbg="; + x86_64-darwin = "sha256-6hcuD63xwolT/dDKnrdfosyJy1W5kyPJJf/H4u6XGfw="; + x86_64-linux = "sha256-7ZDdXAVdMAArOy7iYaqmS6s70TQaZIknRoLRyTKpULg="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.18.0.4543"; + version = "1.19.0.4568"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix index ce8a2762f07b7..e70106200b130 100644 --- a/pkgs/servers/pufferpanel/default.nix +++ b/pkgs/servers/pufferpanel/default.nix @@ -101,7 +101,7 @@ buildGoModule rec { description = "Free, open source game management panel"; homepage = "https://www.pufferpanel.com/"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ckie tie ]; + maintainers = with maintainers; [ tie ]; mainProgram = "pufferpanel"; }; } diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 914eb44019e37..c8acc5debbfd9 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-rKe1xQR3lkPXQBUWmKdHUu/AQ99U1kCINeXV2z/ZG5o="; - arm64-linux_hash = "sha256-O/6brSo25E4BxvxAUQvwQa9kMY/Ga3YxgS+fuaL6/n0="; - x64-osx_hash = "sha256-oVBs0evwPl3Dd6GZlzUWqopB0Zq4mOCUwmLOjs44d6Q="; - arm64-osx_hash = "sha256-iUBy9ob2zOdKVhGbwsJx1ZrT9tD4D1BPLqjB46tCW08="; + x64-linux_hash = "sha256-MlnT16a2l209uqu9DuXLwqf4yiWBn9MggqVubzg0pM4="; + arm64-linux_hash = "sha256-2NkklAOjpDbAXid+rayiQ+jndLluIAMEiKz0MA1Hg0k="; + x64-osx_hash = "sha256-OzUZsXUwE7jF4h/rCvWAY5mh97z/cUbhh6MK0ozHC+A="; + arm64-osx_hash = "sha256-ggNqWCixkHxhiWTYfUx9qeZ9ocTyJEEgSZJqgGOnL+Q="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.6.0.8846"; + version = "5.7.0.8882"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 7040e29470560..f2f159f8e4124 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-GncaJNZEbApPl6Tt9k0NblRPdYnOGiR1V6VTJB8+LIU="; - arm64-linux_hash = "sha256-PvZHTjBmcpfu7fg5TLgcGoLofnAr6QM/2uNbGOpsx+U="; - x64-osx_hash = "sha256-h6JPb9esNlR+zqa8P0U2+zeLyW2JWw+AE/5PBHBGIQA="; + x64-linux_hash = "sha256-jnsIftFHc2UpmW3WBWCff+cUqN40u/xKfQRMS1iMu4M="; + arm64-linux_hash = "sha256-ATdE9wXpew1D0wd/j2ntXBVYj/dMm/rWZLfOBKdrmnY="; + x64-osx_hash = "sha256-2/cUd45vhqdXAsrVPKlRTwOMd+kamW1OIOaB9G7xnjc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.28.2554"; + version = "0.3.29.2565"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/rinetd/default.nix b/pkgs/servers/rinetd/default.nix index 23f1e89a780fe..1cd7d19059d49 100644 --- a/pkgs/servers/rinetd/default.nix +++ b/pkgs/servers/rinetd/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/samhocevar/rinetd"; changelog = "https://github.com/samhocevar/rinetd/blob/${src.rev}/CHANGES.md"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "rinetd"; }; } diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index d6fee8dc56c68..368bca558cdf2 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1413"; + version = "2.0-1432"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-VoTJu5+zuFFknDolGJ/69e1i6B4vfR9ev7sAKhfeRlU="; + hash = "sha256-h0Ly5S8ML29RtaZOpe0k4U/R0coClHHGUZyu5d1PqzQ="; }; dontConfigure = true; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 4c534cc2bfe46..f01358146197c 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.31.1"; + version = "3.32.3"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-qcivNJ3CrvToT8CBq5Z/xssP/srTerXJfRGXcvNh2Ag="; + hash = "sha256-Qqemee13V5+k56Q4hPOKjRsw6pmfALGRcKi4gHBj6eI="; }; patches = [ diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index d66b3cd2726d0..fa90943d1ce12 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.36.3"; + version = "2.36.4"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-+8bw6pFbogM1955OO/w21KnJa+JlAALTRc2m1QAXObE="; + sha256 = "sha256-pKOYyEiVszbZM1iDe8e6YgaNPB6MoiAc24e06Nyeeb0="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index dd8a8005a50a9..8271d9ab760b8 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.41.0"; + version = "1.41.1"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-IeLG2IRHGrx5F3tIcvilhgC9BUFHpIpbzTo6vdQj+ZE="; + sha256 = "sha256-f2diF3mC+OlyCJ5mifC5ueQD2yWuHTGBMZiNvgUReGM="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-bqTw4k2WWE7vsp36Ldexnp/eoFOBUL5po8lZzsbv7D4="; + vendorHash = "sha256-3VP1uQ6AIZna1JH4L86JkW0udbE6miN1dVrQR4hE1u4="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 598be781403de..6de05cba60f3d 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.36"; + version = "8.0.37"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-9PJwa5WKinOA72yVjdlyMHvb7qRR76/DQuTEbim36d0="; + hash = "sha256-4GOgkazZ7EC7BfLATfZPiZan5OJuiDu2UChJ1fa0pho="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index ec681de8ff450..146f2b87968f8 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.26.2"; + version = "8.26.3"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GGqnhsEvv8pnaRmJO+IX64VNQVnBaGZcUKMOiW/PJaQ="; + sha256 = "sha256-YtAQc2Qb7wo4whT7UMXItgbufDfNZPGR2XxL1oEtitk="; }; - vendorHash = "sha256-x1W2niLqhAcroh67cssDuuiJA3Pd5W4Wkh12uKqSfDI="; + vendorHash = "sha256-bzK6PYSg9z1QS+5Vk6pPM10ddrLVRm0C7rmepZt4b0M="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index a69e7eb3aecdd..9eb168751fa89 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -14,7 +14,7 @@ }: let - version = "1.68.1"; + version = "1.68.2"; in buildGoModule { pname = "tailscale"; @@ -24,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-ZAzro69F7ovfdqzRss/U7puh1T37bkEtUXabCYc5LwU="; + hash = "sha256-VI5k8PnPP8r2rIkW7AeQod7JmoHWuSLiaxkZXXv+0T8="; }; patches = [ diff --git a/pkgs/servers/tracing/honeycomb/refinery/default.nix b/pkgs/servers/tracing/honeycomb/refinery/default.nix index f4e29dbcb36cb..364115b6bfee0 100644 --- a/pkgs/servers/tracing/honeycomb/refinery/default.nix +++ b/pkgs/servers/tracing/honeycomb/refinery/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { homepage = "https://github.com/honeycombio/refinery"; description = "Tail-sampling proxy for OpenTelemetry"; license = licenses.asl20; - maintainers = with maintainers; [ lf- ]; + maintainers = [ ]; mainProgram = "refinery"; }; } diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 375347b22fc12..e6275826ccf6f 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "3.0.3"; + version = "3.0.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - hash = "sha256-vjY8sbNkY/kdQiJ020iUWxIVzxkmpkeLhxBThc6tUuE="; + hash = "sha256-9dxg9UL6wkoIs2ql+pLHzd2z+w83vzXYN6zRRLtIegQ="; stripRoot = false; }; - vendorHash = "sha256-rvo3nw9yUfikO82cy6BbukwqwBSrUCCEta3nKBprCbk="; + vendorHash = "sha256-4zI4OL4UlaaefxRPQoUtjyn9M8yfuYOBOyYh6vTnMJg="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index a04165a5aa36c..55d27b196362c 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,21 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.23"; + version = "0.45.24"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = "refs/tags/${version}"; - hash = "sha256-EamTErJfa6mQCem4DWKC53ydupXP+6jrj9tGPlwehLc="; + hash = "sha256-VltrcTbX95agV9JGV2KYGeZ6iUlgzrOsjShsUpiGfes="; }; postPatch = '' substituteInPlace requirements.txt \ --replace "apprise~=1.8.0" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ - --replace "dnspython~=2.4" "dnspython" \ + --replace "dnspython==2.6.1" "dnspython" \ --replace "pytest ~=7.2" "" \ --replace "pytest-flask ~=1.2" "" \ --replace "selenium~=4.14.0" "selenium" \ @@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { flask-paginate flask-restful flask-wtf + greenlet inscriptis jinja2 jinja2-time @@ -51,7 +52,6 @@ python3.pkgs.buildPythonApplication rec { loguru lxml paho-mqtt - pillow playwright pyee pyppeteer diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 79d7d096f6688..8d2ee2ea83bfb 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -41,6 +41,7 @@ , jq , moreutils , terser +, uglify-js , plugins ? [] }@args: @@ -214,7 +215,7 @@ let nativeBuildInputs = runtimeDeps ++ [ postgresql redis - nodePackages.uglify-js + uglify-js terser yarn jq diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index f43aa15887cfd..78c73719b481b 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , nixosTests , php +, writeText }: stdenvNoCC.mkDerivation rec { @@ -16,26 +17,33 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-AAOON1RdbG6JSnCc123jmIlIXHOE1PE49BV4hcASO/s="; }; - passthru.tests = { - inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth freshrss-none-auth; - }; + postPatch = '' + patchShebangs cli/*.php app/actualize_script.php + ''; + + # the thirdparty_extension_path can only be set by config, but should be read by an env-var. + overrideConfig = writeText "constants.local.php" '' + <?php + define('THIRDPARTY_EXTENSIONS_PATH', getenv('THIRDPARTY_EXTENSIONS_PATH') . '/extensions'); + ''; buildInputs = [ php ]; # There's nothing to build. dontBuild = true; - postPatch = '' - patchShebangs cli/*.php app/actualize_script.php - ''; - installPhase = '' runHook preInstall mkdir -p $out cp -vr * $out/ + cp $overrideConfig $out/constants.local.php runHook postInstall ''; + passthru.tests = { + inherit (nixosTests) freshrss-sqlite freshrss-pgsql freshrss-http-auth freshrss-none-auth freshrss-extensions; + }; + meta = with lib; { description = "FreshRSS is a free, self-hostable RSS aggregator"; homepage = "https://www.freshrss.org/"; diff --git a/pkgs/servers/web-apps/freshrss/extensions/default.nix b/pkgs/servers/web-apps/freshrss/extensions/default.nix new file mode 100644 index 0000000000000..c8d779f7933d6 --- /dev/null +++ b/pkgs/servers/web-apps/freshrss/extensions/default.nix @@ -0,0 +1,138 @@ +{ config +, lib +, fetchFromGitHub +, fetchFromGitLab +, callPackage +}: + +let + buildFreshRssExtension = (callPackage ./freshrss-utils.nix { }).buildFreshRssExtension; + + official_extensions_version = "unstable-2024-04-27"; + official_extensions_src = fetchFromGitHub { + owner = "FreshRSS"; + repo = "Extensions"; + rev = "71de129744ba37fd4cf363b78445f5345bc6d0b7"; + hash = "sha256-A+hOjbGNfhwTOAMeo08MUdqfWxxetzLz865oQQDsQlg="; + }; + + baseExtensions = + _self: + lib.mapAttrs (_n: lib.recurseIntoAttrs) { + auto-ttl = buildFreshRssExtension rec { + FreshRssExtUniqueId = "AutoTTL"; + pname = "auto-ttl"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "mgnsk"; + repo = "FreshRSS-AutoTTL"; + rev = "v${version}"; + hash = "sha256-OiTiLZ2BjQD1W/BD8EkUt7WB2wOjL6GMGJ+APT4YpwE="; + }; + meta = { + description = "FreshRSS extension for automatic feed refresh TTL based on the average frequency of entries."; + homepage = "https://github.com/mgnsk/FreshRSS-AutoTTL"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + + demo = buildFreshRssExtension { + FreshRssExtUniqueId = "Demo"; + pname = "demo"; + version = "unstable-2023-12-22"; + src = fetchFromGitHub { + owner = "FreshRSS"; + repo = "xExtension-Demo"; + rev = "8d60f71a2f0411f5fbbb1f88a57791cee0848f35"; + hash = "sha256-5fe8TjefSiGMaeZkurxSJjX8qEEa1ArhJxDztp7ZNZc="; + }; + meta = { + description = "FreshRSS Extension for the demo version."; + homepage = "https://github.com/FreshRSS/xExtension-Demo"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + + reading-time = buildFreshRssExtension rec { + FreshRssExtUniqueId = "ReadingTime"; + pname = "reading-time"; + version = "1.5"; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "Lapineige"; + repo = "FreshRSS_Extension-ReadingTime"; + rev = "fb6e9e944ef6c5299fa56ffddbe04c41e5a34ebf"; + hash = "sha256-C5cRfaphx4Qz2xg2z+v5qRji8WVSIpvzMbethTdSqsk="; + }; + meta = { + description = "FreshRSS extension adding a reading time estimation next to each article."; + homepage = "https://framagit.org/Lapineige/FreshRSS_Extension-ReadingTime"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + + reddit-image = buildFreshRssExtension rec { + FreshRssExtUniqueId = "RedditImage"; + pname = "reddit-image"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "aledeg"; + repo = "xExtension-RedditImage"; + rev = "v${version}"; + hash = "sha256-H/uxt441ygLL0RoUdtTn9Q6Q/Ois8RHlhF8eLpTza4Q="; + }; + meta = { + description = "FreshRSS extension to process Reddit feeds."; + homepage = "https://github.com/aledeg/xExtension-RedditImage"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + + title-wrap = buildFreshRssExtension { + FreshRssExtUniqueId = "TitleWrap"; + pname = "title-wrap"; + version = official_extensions_version; + src = official_extensions_src; + sourceRoot = "source/xExtension-TitleWrap"; + meta = { + description = "FreshRSS extension instead of truncating the title is wrapped."; + homepage = "https://github.com/FreshRSS/Extensions/tree/master/xExtension-TitleWrap"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + + youtube = buildFreshRssExtension { + FreshRssExtUniqueId = "YouTube"; + pname = "youtube"; + version = official_extensions_version; + src = official_extensions_src; + sourceRoot = "source/xExtension-YouTube"; + meta = { + description = "FreshRSS extension allows you to directly watch YouTube/PeerTube videos from within subscribed channel feeds."; + homepage = "https://github.com/FreshRSS/Extensions/tree/master/xExtension-YouTube"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.stunkymonkey ]; + }; + }; + }; + + # add possibility to define aliases + aliases = super: { + # example: RedditImage = super.reddit-image; + }; + + # overlays will be applied left to right, overrides should come after aliases. + overlays = lib.optionals config.allowAliases [ + (_self: super: lib.recursiveUpdate super (aliases super)) + ]; + + toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; +in +(lib.fix toFix) // { + inherit buildFreshRssExtension; +} diff --git a/pkgs/servers/web-apps/freshrss/extensions/freshrss-utils.nix b/pkgs/servers/web-apps/freshrss/extensions/freshrss-utils.nix new file mode 100644 index 0000000000000..bd0fc8f6de546 --- /dev/null +++ b/pkgs/servers/web-apps/freshrss/extensions/freshrss-utils.nix @@ -0,0 +1,45 @@ +{ stdenv, unzip }: +let + buildFreshRssExtension = + args@{ pname + , version + , src + , FreshRssExtUniqueId + , configurePhase ? '' + runHook preConfigure + runHook postConfigure + '' + , buildPhase ? '' + runHook preBuild + runHook postBuild + '' + , dontPatchELF ? true + , dontStrip ? true + , passthru ? { } + , sourceRoot ? "source" + , ... + }: + stdenv.mkDerivation ((removeAttrs args [ "FreshRssExtUniqueId" ]) // { + pname = "freshrss-extension-${pname}"; + + inherit version src configurePhase buildPhase dontPatchELF dontStrip sourceRoot; + + installPrefix = "share/freshrss/extensions/xExtension-${FreshRssExtUniqueId}"; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/$installPrefix" + find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" + + runHook postInstall + ''; + + passthru = passthru // { + inherit FreshRssExtUniqueId; + }; + }); +in +{ + inherit buildFreshRssExtension; +} diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 964baf96f827e..43f3f399b4e1e 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "mediawiki"; - version = "1.41.1"; + version = "1.42.1"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-TguqlTuF6U0xBAyyUSCrxgb6hpsuMxJr37t/xhPoxLI="; + hash = "sha256-7IevlaNd0Jw01S4CeVZSoDCrcpVeQx8IynIqc3N+ulM="; }; postPatch = '' diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index d69ee6a154b04..0d696b33a639d 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -10,16 +10,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.11.13"; + version = "0.12.1"; src = fetchFromGitHub { owner = "pixelfed"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-bEwKaC9fSOGLQbjsuPuIdMMbO3kzvzQxWQR8C2A4mQc="; + hash = "sha256-pNo10vvUD7q0HLM7+GgT+6PyocF4kDZ3Zee4ZCPDJNQ="; }; - vendorHash = "sha256-ahQsOq3qOMGt3b0Ebac4xex+MP9knTmjyCy0PSNE4W8="; + vendorHash = "sha256-y6dgF/LHEYEVG+MgNnZa6f6oMQGvuvAgG6PVbmeMIz4="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 8a9fc7973f98a..98b084ad50e33 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,10 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, installShellFiles, stdenv }: buildGoModule rec { pname = "shiori"; - version = "1.5.5"; + version = "1.7.0"; - vendorHash = "sha256-suWdtqf5IZntEVD+NHGD6RsL1tjcGH9vh5skISW+aCc="; + vendorHash = "sha256-fakRqgoEcdzw9WZuubaxfGfvVrMvb8gV/IwPikMnfRQ="; doCheck = false; @@ -12,18 +12,24 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kGPvCYvLLixEH9qih/F3StUyGPqlKukTWLSw41+Mq8E="; + sha256 = "sha256-5+hTtvBnj3Nh5HitReVkLift9LTiMYVuuYx5EirN0SA="; }; - passthru.tests = { - smoke-test = nixosTests.shiori; - }; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + installShellCompletion --cmd shiori \ + --bash <($out/bin/shiori completion bash) \ + --fish <($out/bin/shiori completion fish) \ + --zsh <($out/bin/shiori completion zsh) + ''; + + passthru.tests.smoke-test = nixosTests.shiori; meta = with lib; { description = "Simple bookmark manager built with Go"; mainProgram = "shiori"; homepage = "https://github.com/go-shiori/shiori"; license = licenses.mit; - maintainers = with maintainers; [ minijackson ]; + maintainers = with maintainers; [ minijackson CaptainJawZ ]; }; } diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index 75dd597001b30..db233e2a70203 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -8,13 +8,13 @@ }: let pname = "slskd"; - version = "0.19.5"; + version = "0.21.1"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; rev = version; - sha256 = "sha256-Vm+nA3yKiCMpQ41GTQF6Iuat89QrUtstQdHmX/DyU9g="; + sha256 = "sha256-ic631e4pyby6EibUkxIGc/uQnVuPY9RFZ9hWvw3u1zk="; }; meta = with lib; { @@ -32,7 +32,7 @@ let src = "${src}/src/web"; npmFlags = [ "--legacy-peer-deps" ]; nodejs = nodejs_18; - npmDepsHash = "sha256-E1J4fYcY1N+UmN4Ch4Ss6ty+nYlmrv3ngvCJ8YCjPfI="; + npmDepsHash = "sha256-06qQ1y870TrkXhkHYADjnWVhdyiLWEqdDt3qrJ1BBFo="; installPhase = '' cp -r build $out ''; @@ -43,8 +43,8 @@ in buildDotnetModule { runtimeDeps = [ mono ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; projectFile = "slskd.sln"; diff --git a/pkgs/servers/web-apps/slskd/deps.nix b/pkgs/servers/web-apps/slskd/deps.nix index 7de44128b9aaa..e4d5bcd850b55 100644 --- a/pkgs/servers/web-apps/slskd/deps.nix +++ b/pkgs/servers/web-apps/slskd/deps.nix @@ -2,114 +2,105 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ + (fetchNuGet { pname = "Asp.Versioning.Abstractions"; version = "8.1.0"; sha256 = "1pcnmhk5viym05kq9ivkx7w03m181z1dd0i9fy450acyzksz7zfa"; }) + (fetchNuGet { pname = "Asp.Versioning.Http"; version = "8.1.0"; sha256 = "0y4zr1brvjsfz3ldjga2zrwvvvsdla9b4hsqgnhk9bdjyfiiwyj3"; }) + (fetchNuGet { pname = "Asp.Versioning.Mvc"; version = "8.1.0"; sha256 = "0wlr7akw6z9nm2a8an4zks08gj9g0bmgg7kmlws3y61rzbwlhk3g"; }) + (fetchNuGet { pname = "Asp.Versioning.Mvc.ApiExplorer"; version = "8.1.0"; sha256 = "12dn272zmgk2z03j5f50jf0a4zin7df4v15q96djbwhrxc6wc7q9"; }) (fetchNuGet { pname = "AutoFixture"; version = "4.18.1"; sha256 = "0whinrvkr2xbhkwd02jbcnws3wz7vlc25hk6w0iw4g92hrmgxqxd"; }) (fetchNuGet { pname = "AutoFixture.Xunit2"; version = "4.18.1"; sha256 = "1xs5dbj410h29spdl5c07vrxqkdl3rcyl2fv4jv4g7vq3kanc5p6"; }) (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "6.0.0"; sha256 = "18qgg6d0ybrr70g69yqamgn5qvpyizlii1123cnj65amd0w2rxjl"; }) (fetchNuGet { pname = "Fare"; version = "2.1.1"; sha256 = "1gagj8k2w5m2z6nlywrzhqx1q9n880yriwk0lsq3vcda9lcggmcz"; }) - (fetchNuGet { pname = "FluentFTP"; version = "48.0.3"; sha256 = "147n6vk3042jm1qspn2jss84qf5v5qh0spv3arpcak2nh61pjrf4"; }) + (fetchNuGet { pname = "FluentFTP"; version = "49.0.2"; sha256 = "14arsbqz7qxpig7nd1amxg9577mgvwak3631kqmiq1x4hfw5whim"; }) (fetchNuGet { pname = "IPAddressRange"; version = "6.0.0"; sha256 = "0fnaxxabamzijj7a418i1z5nnd5ymcjsbplqrj95z8vdw02b99ny"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "7.0.13"; sha256 = "1zzihfm2rwy5z11ndvpi0bx2llghg52msv1mwhgjlrm06q2zff5l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.13"; sha256 = "091cim81z0r0yl33d8qgs5h1xm6r2fwzl4v805arfkjhjr02q3f3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.13"; sha256 = "1wp7dvm9cq3bxz8lxknkjyn9myxlcyr4f0a3296pr48r7jnhafk7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.13"; sha256 = "0n7g7581n9gmpxm2bi0mgxkwj63gva9kmy3njb3zpvvr2vz93fq2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning"; version = "5.1.0"; sha256 = "09v155s17px3d4zm2qz4syj6gdj17sb1a18fzwwvsrs3h357m4c1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer"; version = "5.1.0"; sha256 = "01bhvs1n7217js1rh3vgl5i2gmxvkgpa3b8i71sv3k8bcz29101l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.13"; sha256 = "13mpw2rj0yb68gvjzb0yg5nzl9wi5pg95swmb4lj38vzypbc897p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.13"; sha256 = "1lk74hsv3m1sc86cjrbx89a9w7f0a8v38sk6nmig49bk1fkpnb46"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.13"; sha256 = "0fvajiq24waqxh7pvp3kjnjbj7adhffhm21rmw6l09dvcin8hqwf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.13"; sha256 = "0kzisw542lvcn96n7vk2cwb9n2kb580hxanwahw57x3j8kyz97nz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "7.0.4"; sha256 = "0x0gb6r9lr72jcnv3kkgi01zx1hgpx54niszmrjkdcfivbmmaa81"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Authentication.JwtBearer"; version = "8.0.6"; sha256 = "1ks797mr3pjq01zxhknccv5rxi7z6vbw9p19nz69ir4xxf8kfj5d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "8.0.6"; sha256 = "1lw5fjmxb3nvl3akhv16plv83g59m554k7944ahpak77860cqyr8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "8.0.6"; sha256 = "1gs2f63j0z63qzj8564ldba02i4754b8x80d7rmyb0hihz60fyf6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "8.0.6"; sha256 = "101b91c8iqfs55am569sgd6bc66dhqqxnll4jbcshvz5q6j4yaq4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "8.0.6"; sha256 = "0csdgi0z40kyyxpy3wqd558n2s8mf4c6zxh785parg27r0bl41mi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "8.0.6"; sha256 = "0kl6skydfslz7p6hixlgq8y4472pwfmyar18nqydabmfl8w5fy1j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "8.0.6"; sha256 = "03cncacrdhsc0yfrzwxs3cmsj8g1fy1nc49xjg58vid3i1jc81pz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "8.0.6"; sha256 = "05yw7c79zdj7y0kwpfbgzcnh130rrphscg76y96sq1q3fp3gh3x6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "8.0.0"; sha256 = "1mkzpxk07mcvb1wkqsm4cz0kjln0m5z4fn902874dcj9v5phi8v7"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.13"; sha256 = "07k00mk8f9pd4gcmx81i3l5kqbih2abc939lixpak7hmqzf3a18r"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.13"; sha256 = "1rnm635jvjyxc7jb9isgarasrhmpvsahv6r6gp4b7li1y2sz3pyv"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "7.0.13"; sha256 = "0jmmfcqvxfacgycwdqqrxgimjk83m59w68lpy5vgnqwcbfabg7zj"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "7.0.13"; sha256 = "0r36s142lknwx8j9lnxnx70wv3i7f4z6y2d5fi7r2whd3rvidkpq"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "7.0.13"; sha256 = "030s0rz3xjdlr77p1s7w0mqs0jrwgsklz63bnm30sxgr6zb25pz3"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "7.0.13"; sha256 = "0kx5056d6qkyxdcpqz46gd344xmizp2w0hknxh1x06bdfsnd292i"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "7.0.13"; sha256 = "1mrgz6r4nllm3v8lgg1xy53am80kscr8kfh18xzc48w3frxwslr7"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.6"; sha256 = "17h6jhhaagdhk1ljyjgxsqq168xw7yda5ys1sxls7nqkbrq3an5p"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.6"; sha256 = "0sifqhm9myix618a77w5h4v66da9dgq0aabgqrics30bpmnh219j"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; sha256 = "0q9j6qqns82c99imkqaw1ngq0x19flbm1p9wc92b0l46n3lz7lsg"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; sha256 = "0zq9hcajib3b2j5xn7qllfq2x9g6xh9s8rap03r729llsl1hims5"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; sha256 = "17r858s69mar0k70zqf0r2cp7k7sc06xazml0ncgacglw9l9ydb9"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; sha256 = "1p55h0w30gxvnbq312pbivwss5la86zz7nmfa9wvskdp5b6y8rwp"; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.6"; sha256 = "181lp36mh96rix1f8zl0061p2m37ksw7dnj9r384n1cxw1961dg2"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "7.0.0"; sha256 = "1hv94kwd4v7969cq3ik2afg5ipn44zbhpsgaga9cd0z47swz4r3a"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "7.0.0"; sha256 = "09mq6g61rqjy5mdhsz2224m0rb0z9rkrxhhqym9zwpn272bbc9df"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.0"; sha256 = "0cqbvy49ph16rlba2f35qhi0n7vpcf5kjybvn5fbs7dchfdzw927"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.0"; sha256 = "06s8j8v0w06f12jxw6vvsd0l5zqrmsvc3rr2gqx9z3gcq7mdnr3l"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "7.0.0"; sha256 = "04wb6hw3r7mmhg57215r1mb01q17glyaddjw1j5g1drsws914fj4"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; sha256 = "1wyhpamm1nqjfi3r463dhxljdlr6rm2ax4fvbgq2s0j3jhpdhd4p"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "6.0.9"; sha256 = "06mx8zmlmi371ab5pskw8iawy8bbi4vx6rwrcj0andc59zfmg96q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "6.0.9"; sha256 = "1nv2rwq0q7ql63qip5ba45p97yxgva9jg6gnvrnfh2yk2fjwyag2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.13"; sha256 = "1sdn9cssq7khq094zb5y8mrp3xapfbmccgm0wgd0chs0h3vxim49"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "8.0.6"; sha256 = "0kl39lwpmk3wa3h4wanz80ckzzl5ffyn5ydgccpcjzy7ihpj4j95"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "6.0.0"; sha256 = "1mwjx6li4a82nb589763whpnhf5hfy1bpv1dzqqvczb1lhxhzhlj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.1.0"; sha256 = "02ipxf75rqzsbmmy5ka44hh8krmxgky9mdxmh8f7fkbclpg2s6cy"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.2"; sha256 = "1wv54f3p3r2zj1pr9a6z8zqrh2ihm6v6qcw2pjwis1lcc0qb472m"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; sha256 = "0i9pgmk60b8xlws3q9z890gim1xjq42dhyh6dj4xvbycmgg1x1sd"; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "7.0.0"; sha256 = "15lz0qk2gr2q52i05ip51dzm9p4hzqlrammkc0hv2ng6g0z72697"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.0"; sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; sha256 = "0ghz4y4gxnf2vw8yvhz9nkw21p6q2qqwh19phkk1xwxywyilr3mq"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; sha256 = "0as39ml1idgp42yvh725ddqp4illq87adzd1ymzx6xjxsxsjadq2"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.1"; sha256 = "1jnswvv5d6gbnssmql08d72pb0a42xscp4k5k1svsk8k5pj3nf8p"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.15.1"; sha256 = "1075g2g30g7qmznc9mf97nm4k4xbz4s37bi59qxwbx0y2pnl1f2r"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.15.1"; sha256 = "19sbh8hxbbp24294k8vc6z92906wq366m49k5484mngwrw5jpsyf"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.1"; sha256 = "1ljg7nrxjkfcwh081831s30agpfx8f3flqvwg5piy6vfc9hqmxa8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.1.2"; sha256 = "01jdg8b1hi4nx5h1cn9baalfkp4y70kc2wf4lz77kw8w1fvrppa0"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.1.2"; sha256 = "1y9yq07hr91aaxm7pahv3fc590dzydlffr4hs3zix1g45pvd4m4i"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.1.2"; sha256 = "1yi7s2pm4f8vl6b0qck0nrfsrf1h4jwamznkzl75n1cwxpbdikp8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "7.1.2"; sha256 = "0ql5b7472g7359b1pqh2lfm8s3lym9vyzj1xpvbhsv9syk9czrg8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "7.1.2"; sha256 = "06r9i1m6zhfbbx18p0drpcbswirlq7xg0wm3iqfjgzxyv053033h"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.1.2"; sha256 = "1q70c1ax9f5nggqp4g8nyfaz0481grsaxhp85cmjpmx8l3q35zx9"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) (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.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) (fetchNuGet { pname = "Moq"; version = "4.16.1"; sha256 = "1m2gwbx0gsy84rl9c3hgdaw9gz8d08ffg19nwg0idsdqmmiq887l"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "OneOf"; version = "3.0.263"; sha256 = "08jiy5ff6nx3bbmia7iqcfrva0bynr87m0m4nxkzm5ri21w49ri1"; }) - (fetchNuGet { pname = "prometheus-net"; version = "8.2.0"; sha256 = "19m9lkpc4h9a0jmn66p61x8960gk9fidcwic70nrvjhmd5m201fj"; }) - (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.0"; sha256 = "1lilk7xw19wgl2i7cjbf09ssd4jicla45wj29hfy6d1bzcnd6yn8"; }) - (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "8.2.0"; sha256 = "1kzvlab31ypgp62663nnr6g964w19iabnyilqlkm6acl5f5vvfvv"; }) + (fetchNuGet { pname = "OneOf"; version = "3.0.271"; sha256 = "09b15fh1f3wzx3m9m3150pyflb02h9vqspg7aigm4p9zk3qb4mdl"; }) + (fetchNuGet { pname = "prometheus-net"; version = "8.2.1"; sha256 = "0g1hf6v6k4ym9a663az76775rkazvxmfl4yb60w0ghqzvrfxw49p"; }) + (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.1"; sha256 = "1rygyyflx53djczfgavr6jzqgz0sfw3r1h93gm3gs3v48d6c06kn"; }) + (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "8.2.1"; sha256 = "012954anrd279hjdav4bb1rrblbnsq2fs15l4s6ab6cz6ih4hi0b"; }) (fetchNuGet { pname = "prometheus-net.DotNetRuntime"; version = "4.4.0"; sha256 = "1hrzf2djkjiswyf4xg3pl6rb0a8i0mh294hrfbna782hfxya7c29"; }) - (fetchNuGet { pname = "prometheus-net.SystemMetrics"; version = "3.0.0"; sha256 = "0gl1msasy19vy836dzwkp8046f141nlrx0fhzg70vzfzjnrh3jm5"; }) + (fetchNuGet { pname = "prometheus-net.SystemMetrics"; version = "3.1.0"; sha256 = "1k6qw6bgfq5h88z0zjndv7hpaaicgln96py9y1nyskms1xhdxb7n"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -156,7 +147,7 @@ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "Serilog"; version = "3.1.1"; sha256 = "0ck51ndmaqflsri7yyw5792z42wsp91038rx2i6vg7z4r35vfvig"; }) - (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.0"; sha256 = "0g1scn1a5paiydxk1nnrwzzqny2vabc3hniy6jwjqycag6ch2pni"; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; sha256 = "0vmrbhj9vb00fhvxrw3w5j1gvdx4xzxz8d2cp65hps988zxwykkb"; }) (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; sha256 = "10cgp4nsrzkld5yxnvkfkwd0wkc1m8m7p5z42w4sqd8f188n8i9q"; }) (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; sha256 = "087ab94sfhkj6h6x3cwwf66g456704faxnfyc4pi6shxk45b318s"; }) (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; sha256 = "0y7vg2qji02riq7r0kgybarhkngw6gh3xw89w7c2hcmjawd96x3k"; }) @@ -167,17 +158,17 @@ (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) (fetchNuGet { pname = "Serilog.Sinks.Grafana.Loki"; version = "7.1.1"; sha256 = "1c7csknq5v09j2x3ybrssxk59aca9x678j53wp73ryjh0niqxznl"; }) (fetchNuGet { pname = "Serilog.Sinks.Http"; version = "8.0.0"; sha256 = "1sx30n2cn5ixfvxs8llgk19r0vvv27246341bjy2h4994sl8zgld"; }) - (fetchNuGet { pname = "Soulseek"; version = "6.2.0"; sha256 = "1nz4fcqpf4mqbc8ig1311vkcn11wcx3nayk56cn7syqczpdqzqxv"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) + (fetchNuGet { pname = "Soulseek"; version = "6.5.0"; sha256 = "0gcczchpp96dl0zcb3m50ach7sny1z3frcq7vspbyq0qffws5xa2"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; sha256 = "0pzgdfl707pd9fz108xaff22w7c2y27yaix6wfp36phqkdnzz43m"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; sha256 = "0g959z7r3h43nwzm7z3jiib1xvyx146lxyv0x6fl8ll5wivpjyxq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; sha256 = "1vs1c7yhi0mdqrd35ji289cxkhg7dxdnn6wgjjbngvqxkdhkyxyc"; }) (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.435"; sha256 = "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy"; }) (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.435"; sha256 = "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) @@ -214,7 +205,7 @@ (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.1.2"; sha256 = "09ds8xanyd4zgncsl77gnlcz4kqw00s9ap3wvc6c8lrj91vmc58h"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) @@ -225,7 +216,7 @@ (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; sha256 = "00f36lqz1wf3x51kwk23gznkjjrf5nmqic9n7073nhrgrvb43nid"; }) (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"; }) @@ -278,7 +269,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) @@ -297,16 +287,14 @@ (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.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "8.0.0"; sha256 = "060ab3gxgmffzlfcj08hpmkyfkhyiky9brw35klbl32pnfhdi53k"; }) (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"; }) @@ -323,15 +311,15 @@ (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) (fetchNuGet { pname = "Utility.CommandLine.Arguments"; version = "6.0.0"; sha256 = "0i8m0vn1wm4wy7d3radyha6kxg0l50r2q02zlmkg6633yyiqry1a"; }) (fetchNuGet { pname = "Utility.EnvironmentVariables"; version = "1.0.5"; sha256 = "1x9vd5qni194yxc18pcrnvln9zib01sgai7ygw86zcj5137hj72i"; }) - (fetchNuGet { pname = "xunit"; version = "2.6.3"; sha256 = "0yy0579ipqk4fab877kc0y947q9i83329rwwf47apwgbhpkcfi62"; }) + (fetchNuGet { pname = "xunit"; version = "2.6.6"; sha256 = "024290yclyq54jrm29bj6vipshq4dxpci9y06b9j8cpbsn7drr5s"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.1"; sha256 = "0c7zkf3i8n1mhc457q859klk067bw1xbf31lyxlwc5hlx9aqz65z"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.7.0"; sha256 = "0dga1c6icksd6y7c652pkwcmdsqxrgnxj3v2nijc0vayqa5prnvc"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.6.3"; sha256 = "0i4g5sw0j2j4ajya671d4ragq3xrgpaf2bw5fzs7hlkykm0s5vgc"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.6.3"; sha256 = "14jissxdzrshnrz8rbgxzvn93if808fvmcbha6bz9f5yh503z88p"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.10.0"; sha256 = "0b4rbxpx4bmbjr18zn5afahx9imhqv0dg76flhjxsqzvx66zjqaf"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.6.6"; sha256 = "1rkp96b4zdbv38r2hffhcwfp82vcs86a24b09001h4x5ln51bdb5"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.6.6"; sha256 = "0xi254srmvrrqkzq0n74d048hphijsk38gx47r68vm44q1vpzpln"; }) (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.2.0"; sha256 = "0l9fl09l709dq671r5yvmcrk9vhxgszmxf3ny1h9ja2sp9xx5pbs"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.3"; sha256 = "1j9hjrar5lr3irxmpnbk564dc4g11hkjx6w4241xx333pz4h8jr5"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.3"; sha256 = "0514n70rizl96kx9b62qpsia2nc7k9rjbmwn32vbclpvil2jdy07"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.5"; sha256 = "06w2skg7vn1wag7x06z8gw2rbfzq21i3alg6dfcwj0rkq98zyxac"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "13.7.1"; sha256 = "1m2lnfb2r8382fpjyxp79wnbis7l462zksj3618142q53y33bk5z"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.6"; sha256 = "0f8w71b58kbv23b7p6083jxy4pmpsa59r8xqpp2j71300cyp2rl0"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.6"; sha256 = "0n295fxvzwp4d27qa644m55klapvcmynb240rwcjr95yvgsfzjz4"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.6"; sha256 = "1knl6myb5zip2yii1mm5kxvkq81z3zj7dkn8zlqbb4ylaxslzf88"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "15.3.0"; sha256 = "0mcj6j6i756gd6bnmnvcajbf6xfhscbls4b6gs5c3q8w66dmxdys"; }) ] diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index b77dbed3b55ac..0368963ceb519 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-h++IXL1y6f52mSBRP3TiqLMKkFXP/QKaNlpM2PCgT5k="; + hash = "sha256-+JpL6LadrD5FDxtiv+YNkfqylYEp/1aSlkLIaFXl5mw="; }; - npmDepsHash = "sha256-OsG9FCdlSQYWrne/jaklNIsCT0M4+vt8DxZ9CGPfbzM="; + npmDepsHash = "sha256-HMRYbVw4mfxOoPaAzquCEBy97hUC3tR6s1Z8MppJgzY="; buildInputs = lib.optionals withSystemd [ systemdMinimal diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 25798533113c8..a757834a4f2df 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -80,6 +80,10 @@ stdenv.mkDerivation rec { "bash_cv_job_control_missing=nomissing" "bash_cv_sys_named_pipes=nomissing" "bash_cv_getcwd_malloc=yes" + # This check cannot be performed when cross compiling. The "yes" + # default is fine for static linking on Linux (weak symbols?) but + # not with OpenBSD, when it does clash with the regular `getenv`. + "bash_cv_getenv_redef=${if !(with stdenv.hostPlatform; isStatic && isOpenBSD) then "yes" else "no"}" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "--without-libintl-prefix" "--without-libiconv-prefix" diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 12c88764e5542..37b3d67559c9f 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-nmih6kyVaYLVOG+EEaCUYkVRAXPXXUdPchv6JFzlU+U="; + hash = "sha256-ht0zeeePU2fPMP7/Q0K2VKUudVCa4T94sESJCxix04M="; }; - vendorHash = "sha256-QG+50wqYYpASzFv8Y3rpuyahW/lTV8Kz+v3rDt1kAN4="; + vendorHash = "sha256-XDX59HFf0yMEy9D5nQLZk1LeKrBcgC8M5kUyGiy29Ak="; ldflags = [ "-s" diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 8ed6bb21091cf..e270a895c42c2 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-06-29"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "a992f5b4fa2f7d907cbe32cb8933f05546b598a4"; - hash = "sha256-TVRqwvIwVZQDmrj20bna9oU8jtVp5FAzEp4L2mcyHVU="; + rev = "61a805eb06f27dfb4651877ae4e0fd85e2b9f1b7"; + hash = "sha256-ZcpcxRKtx2lS39c09txLGysRkLq6dNyy+9aZNrfGcT0="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index f91709a4c29a7..fd83401ba59b0 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-ZmOmdIvSs60GYT4zfhYONmfayDOEHG8acsf4u1A2wWQ="; + sha256 = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix index 67111738bd5d3..9854d76ce2818 100644 --- a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-history-search/default.nix @@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/joshskidmore/zsh-fzf-history-search"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 2b978ff3e1bcf..1b7882bcbed37 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -83,6 +83,8 @@ with pkgs; inherit gccTests; }; + devShellTools = callPackage ../build-support/dev-shell-tools/tests { }; + stdenv-inputs = callPackage ./stdenv-inputs { }; stdenv = callPackage ./stdenv { }; diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index e06759fa28bd4..00f1ce90ef3ad 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -99,6 +99,9 @@ let in { + # Disable on Darwin due to assumptions with __bootPackages + __attrsFailEvaluation = stdenv.isDarwin; + # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; }); diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index bbc0e75d88112..0223c088c8174 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, libxslt, - gobject-introspection, gtk3, wrapGAppsHook3, gnome }: + gobject-introspection, gtk3, wrapGAppsHook3, adwaita-icon-theme }: python3Packages.buildPythonApplication rec { pname = "wpgtk"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ wrapGAppsHook3 gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme libxslt ]; diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 2db13aa1275ee..5ef9536b987e6 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.209"; + version = "3.0.210"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-d3HLFyJp++tZLJHjjM2xOcYyUanI9/AlrLt0cTcWO8s="; + sha256 = "sha256-x5uXlcSdXrPQ8mxqH2QH6atHQBlsSfU7e8pMe585MSk="; }; vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; diff --git a/pkgs/tools/admin/azure-cli/README.md b/pkgs/tools/admin/azure-cli/README.md new file mode 100644 index 0000000000000..30936ded0a751 --- /dev/null +++ b/pkgs/tools/admin/azure-cli/README.md @@ -0,0 +1,101 @@ +# Azure CLI + +## Extensions + +There are two sets of extensions: the one in `extensions-generated.nix` is generated with the script +`query-extension-index.sh`. These are extensions that don't have external requirements and thus can +be easily maintained and updated. The set should only be manipulated through an update based on the +script output. + +The other set of extensions is in `extensions-manual.nix`. These are extensions with requirements, +which need to be packaged and maintained manually. + +### Adding an extension to `extensions-manual.nix` + +To manually add a missing extension, first query its metadata from the extension index. +Use the following command, use the current version of azure-cli in nixpkgs as `cli-version` +and the name of the extension you want to package as `extension`: + +```sh +./query-extension-index.sh --cli-version=2.61.0 --extension=azure-devops --download +``` + +The output should look something like this: + +```json +{ + "pname": "azure-devops", + "description": "Tools for managing Azure DevOps.", + "version": "1.0.1", + "url": "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240514.1/azure_devops-1.0.1-py2.py3-none-any.whl", + "sha256": "f300d0288f017148514ebe6f5912aef10c7a6f29bdc0c916b922edf1d75bc7db", + "license": "MIT", + "requires": [ + "distro (==1.3.0)", + "distro==1.3.0" + ] +} +``` + +Based on this, you can add an attribute to `extensions-manual.nix`: + +```nix + azure-devops = mkAzExtension rec { + pname = "azure-devops"; + version = "1.0.0"; + url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; + sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; + description = "Tools for managing Azure DevOps"; + propagatedBuildInputs = with python3Packages; [ + distro + ]; + meta.maintainers = with lib.maintainers; [ katexochen ]; + }; +``` + +* The attribute name should be the same as `pname`. +* Replace the version in `url` with `${version}`. +* The json output `requires` must be transformed into `propagetedBuildInputs`. +* If `license` is `"MIT"`, it can be left out in the nix expression, as the builder defaults to that license. +* Add yourself as maintainer in `meta.maintainers`. + +### Testing extensions + +You can build azure-cli with an extension on the command line by running the following command at the root of this repository: + +```sh +nix build --impure --expr 'with (import ./. {}); azure-cli.withExtensions [ azure-cli.extensions.azure-devops ]' +``` + +Check if the desired functionality was added. + +You can check if the extensions was recognized by running: + +```sh +./result/bin/az extension list +``` + +The output should show the extension like this: + +```sh +[ + { + "experimental": false, + "extensionType": "whl", + "name": "azure-devops", + "path": "/nix/store/azbgnpg5nh5rb8wfvp0r9bmcx83mqrj5-azure-cli-extensions/azure-devops", + "preview": false, + "version": "1.0.0" + } +] +``` + +### Removing an extension + +If extensions are removed upstream, an alias is added to the end of `extensions-manual.nix` +(see `# Removed extensions`). This alias should throw an error and be of similar structure as +this example: + +```nix +blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 +``` diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix index 6e098fb1f3cf8..66c2268bffbb1 100644 --- a/pkgs/tools/admin/azure-cli/extensions-manual.nix +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -1,3 +1,7 @@ +# Manually packaged extensions for azure-cli +# +# Checkout ./README.md for more information. + { lib , mkAzExtension , mycli @@ -12,6 +16,7 @@ sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; description = "Tools for managing Azure DevOps"; propagatedBuildInputs = with python3Packages; [ distro ]; + meta.maintainers = with lib.maintainers; [ katexochen ]; }; rdbms-connect = mkAzExtension rec { diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index ec51b07d9e5bc..f5850aa82c009 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.2.10"; + version = "18.2.17"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-HZAQpK7cai4FEBvQSIHGBdDMe4pQRXXF9DSax07rjF0="; + hash = "sha256-sWe7D89bL7mWanxCAOAso6J9fuxPFh3PHUL2mR8aOBs="; }; - npmDepsHash = "sha256-9XVjyqLgi+gkEEp09P4HzmeRNINeXUC4mBmib6M6YyE="; + npmDepsHash = "sha256-lYgt0du8OfJitVbfWiUqrEGulvs/OxqF4AdxyGCRCJY="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index 50325a6690cf9..73acc0944df79 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "boulder"; - version = "2024-06-17a"; + version = "2024-06-25"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -21,7 +21,7 @@ buildGoModule rec { find $out -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-kObCD9diy1ryyeLQNyfWNMJPfvtjAWVp8OVUO0MLV6A="; + hash = "sha256-AOCYCTIgT9QAn6LR72OG2C8Li1UMFieDrtkplXv4plA="; }; vendorHash = null; @@ -42,49 +42,260 @@ buildGoModule rec { preCheck = '' # Test all targets. unset subPackages - - # Disable tests that fail or require additional services. - rm -f \ - cmd/admin-revoker/main_test.go \ - cmd/admin/cert_test.go \ - cmd/admin/key_test.go \ - cmd/bad-key-revoker/main_test.go \ - cmd/cert-checker/main_test.go \ - cmd/config_test.go \ - cmd/contact-auditor/main_test.go \ - cmd/expiration-mailer/main_test.go \ - cmd/expiration-mailer/send_test.go \ - cmd/id-exporter/main_test.go \ - cmd/rocsp-tool/client_test.go \ - cmd/shell_test.go \ - core/util_test.go \ - db/map_test.go \ - db/multi_test.go \ - db/rollback_test.go \ - grpc/creds/creds_test.go \ - log/log_test.go \ - ocsp/updater/updater_test.go \ - ra/ra_test.go \ - ratelimits/limiter_test.go \ - ratelimits/source_redis_test.go \ - ratelimits/source_test.go \ - redis/lookup_test.go \ - rocsp/rocsp_test.go \ - sa/database_test.go \ - sa/model_test.go \ - sa/precertificates_test.go \ - sa/rate_limits_test.go \ - sa/sa_test.go \ - test/load-generator/acme/directory_test.go \ - va/caa_test.go \ - va/dns_test.go \ - va/http_test.go \ - va/tlsalpn_test.go \ - va/va_test.go \ - wfe2/verify_test.go \ - wfe2/wfe_test.go ''; + # Tests that fail or require additional services. + disabledTests = [ + "TestARI" + "TestAccount" + "TestAddBlockedKeyUnknownSource" + "TestAddCertificate" + "TestAddCertificateDuplicate" + "TestAddCertificateRenewalBit" + "TestAddPreCertificateDuplicate" + "TestAddPrecertificate" + "TestAddPrecertificateIncomplete" + "TestAddPrecertificateKeyHash" + "TestAddPrecertificateNoOCSP" + "TestAddRegistration" + "TestAddSerial" + "TestAdministrativelyRevokeCertificate" + "TestAuthorization500" + "TestAuthorizationChallengeNamespace" + "TestAuthzFailedRateLimitingNewOrder" + "TestAutoIncrementSchema" + "TestBadNonce" + "TestBlockedKey" + "TestBlockedKeyRevokedBy" + "TestBuildID" + "TestCTPolicyMeasurements" + "TestCertIsRenewed" + "TestCertificateAbsent" + "TestCertificateKeyNotEqualAccountKey" + "TestCertificatesTableContainsDuplicateSerials" + "TestCertsPerNameRateLimitTable" + "TestChallenge" + "TestCheckCert" + "TestCheckCert" + "TestCheckCertReturnsDNSNames" + "TestCheckCertReturnsDNSNames" + "TestCheckExactCertificateLimit" + "TestCheckFQDNSetRateLimitOverride" + "TestCheckWildcardCert" + "TestCheckWildcardCert" + "TestClientTransportCredentials" + "TestContactAuditor" + "TestCountCertificatesByNamesParallel" + "TestCountCertificatesByNamesTimeRange" + "TestCountCertificatesRenewalBit" + "TestCountInvalidAuthorizations2" + "TestCountNewOrderWithReplaces" + "TestCountOrders" + "TestCountPendingAuthorizations2" + "TestCountRegistrationsByIP" + "TestCountRegistrationsByIPRange" + "TestDbSettings" + "TestDeactivateAccount" + "TestDeactivateAuthorization" + "TestDeactivateRegistration" + "TestDedupOnRegistration" + "TestDirectory" + "TestDontFindRevokedCert" + "TestEarlyOrderRateLimiting" + "TestEmptyAccount" + "TestEnforceJWSAuthType" + "TestExactPublicSuffixCertLimit" + "TestExtractJWK" + "TestFQDNSetTimestampsForWindow" + "TestFQDNSets" + "TestFQDNSetsExists" + "TestFailExit" + "TestFasterGetOrderForNames" + "TestFinalizeAuthorization2" + "TestFinalizeOrder" + "TestFinalizeOrderWildcard" + "TestFinalizeOrderWithMixedSANAndCN" + "TestFinalizeSCTError" + "TestFindCertsAtCapacity" + "TestFindExpiringCertificates" + "TestFindIDs" + "TestFindIDsForHostnames" + "TestFindIDsWithExampleHostnames" + "TestFindUnrevoked" + "TestFindUnrevokedNoRows" + "TestGETAPIAuthz" + "TestGETAPIChallenge" + "TestGenerateOCSP" + "TestGenerateOCSPLongExpiredSerial" + "TestGenerateOCSPUnknownSerial" + "TestGetAndProcessCerts" + "TestGetAndProcessCerts" + "TestGetAuthorization" + "TestGetAuthorization2NoRows" + "TestGetAuthorizations2" + "TestGetCertificate" + "TestGetCertificateHEADHasCorrectBodyLength" + "TestGetCertificateNew" + "TestGetCertificateServerError" + "TestGetCertsEmptyResults" + "TestGetCertsEmptyResults" + "TestGetChallenge" + "TestGetChallengeUpRel" + "TestGetMaxExpiration" + "TestGetOrder" + "TestGetOrderExpired" + "TestGetOrderForNames" + "TestGetPendingAuthorization2" + "TestGetRevokedCerts" + "TestGetSerialMetadata" + "TestGetSerialsByAccount" + "TestGetSerialsByKey" + "TestGetStartingID" + "TestGetValidAuthorizations2" + "TestGetValidOrderAuthorizations2" + "TestHTTPDialTimeout" + "TestHTTPMethods" + "TestHandleFunc" + "TestHeaderBoulderRequester" + "TestIgnoredLint" + "TestIgnoredLint" + "TestIncidentARI" + "TestIncidentSerialModel" + "TestIncidentsForSerial" + "TestIndex" + "TestIndexGet404" + "TestInvoke" + "TestInvokeRevokerHasNoExtantCerts" + "TestIssueCertificateAuditLog" + "TestIssueCertificateCAACheckLog" + "TestIssueCertificateInnerErrs" + "TestIssueCertificateInnerWithProfile" + "TestIssueCertificateOuter" + "TestKeyRollover" + "TestKeyRolloverMismatchedJWSURLs" + "TestLeaseOldestCRLShard" + "TestLeaseSpecificCRLShard" + "TestLifetimeOfACert" + "TestLimiter_CheckWithLimitOverrides" + "TestLimiter_DefaultLimits" + "TestLimiter_InitializationViaCheckAndSpend" + "TestLimiter_RefundAndReset" + "TestLoadFromDB" + "TestLookupJWK" + "TestMatchJWSURLs" + "TestNewAccount" + "TestNewAccountNoID" + "TestNewAccountWhenAccountHasBeenDeactivated" + "TestNewAccountWhenGetRegByKeyFails" + "TestNewAccountWhenGetRegByKeyNotFound" + "TestNewECDSAAccount" + "TestNewLookup" + "TestNewLookupWithAllFailingSRV" + "TestNewLookupWithOneFailingSRV" + "TestNewOrder" + "TestNewOrderAuthzReuseSafety" + "TestNewOrderCheckFailedAuthorizationsFirst" + "TestNewOrderExpiry" + "TestNewOrderFailedAuthzRateLimitingExempt" + "TestNewOrderMaxNames" + "TestNewOrderRateLimiting" + "TestNewOrderRateLimitingExempt" + "TestNewOrderReplacesSerialCarriesThroughToSA" + "TestNewOrderReuse" + "TestNewOrderReuseInvalidAuthz" + "TestNewOrderWildcard" + "TestNewRegistration" + "TestNewRegistrationBadKey" + "TestNewRegistrationContactsPresent" + "TestNewRegistrationNoFieldOverwrite" + "TestNewRegistrationRateLimit" + "TestNewRegistrationSAFailure" + "TestNoContactCertIsNotRenewed" + "TestNoContactCertIsRenewed" + "TestNoSuchRegistrationErrors" + "TestNonceEndpoint" + "TestOldTLSInbound" + "TestOrderMatchesReplacement" + "TestOrderToOrderJSONV2Authorizations" + "TestOrderWithOrderModelv1" + "TestPOST404" + "TestPanicStackTrace" + "TestParseJWSRequest" + "TestPendingAuthorizationsUnlimited" + "TestPerformValidationAlreadyValid" + "TestPerformValidationBadChallengeType" + "TestPerformValidationExpired" + "TestPerformValidationSuccess" + "TestPerformValidationVAError" + "TestPrepAuthzForDisplay" + "TestPreresolvedDialerTimeout" + "TestProcessCerts" + "TestProcessCertsConnectError" + "TestProcessCertsParallel" + "TestRecheckCAADates" + "TestRecheckCAAEmpty" + "TestRecheckCAAFail" + "TestRecheckCAAInternalServerError" + "TestRecheckCAASuccess" + "TestRedisSource_BatchSetAndGet" + "TestRedisSource_Ping" + "TestRegistrationsPerIPOverrideUsage" + "TestRehydrateHostPort" + "TestRelativeDirectory" + "TestReplicationLagRetries" + "TestResolveContacts" + "TestRevokeCertByApplicant_Controller" + "TestRevokeCertByApplicant_Subscriber" + "TestRevokeCertByKey" + "TestRevokeCertificate" + "TestRevokeCerts" + "TestRollback" + "TestSPKIHashFromPrivateKey" + "TestSPKIHashesFromFile" + "TestSelectRegistration" + "TestSelectUncheckedRows" + "TestSendEarliestCertInfo" + "TestSerialsForIncident" + "TestSerialsFromFile" + "TestSerialsFromPrivateKey" + "TestSetAndGet" + "TestSetOrderProcessing" + "TestSingleton" + "TestStart" + "TestStatusForOrder" + "TestStoreResponse" + "TestStrictness" + "TestTLSALPN01DialTimeout" + "TestTLSConfigLoad" + "TestTimeouts" + "TestUpdateCRLShard" + "TestUpdateChallengeFinalizedAuthz" + "TestUpdateChallengeRAError" + "TestUpdateChallengesDeleteUnused" + "TestUpdateMissingAuthorization" + "TestUpdateNowWithAllFailingSRV" + "TestUpdateNowWithOneFailingSRV" + "TestUpdateRegistrationSame" + "TestUpdateRevokedCertificate" + "TestValidJWSForKey" + "TestValidNonce" + "TestValidNonce_NoMatchingBackendFound" + "TestValidPOSTAsGETForAccount" + "TestValidPOSTForAccount" + "TestValidPOSTForAccountSwappedKey" + "TestValidPOSTRequest" + "TestValidPOSTURL" + "TestValidSelfAuthenticatedPOST" + "TestValidSelfAuthenticatedPOSTGoodKeyErrors" + "TestValidateContacts" + "TestWrappedMap" + "Test_sendError" + ]; + + checkFlags = [ + "-skip ${lib.strings.concatStringsSep "|" disabledTests}" + ]; + postInstall = '' for i in $($out/bin/boulder --list); do ln -s $out/bin/boulder $out/bin/$i diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 0e890270a52b0..2ec57721e4199 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-UiZfp1bX/Eul5x31oBln5P9KMT2oFwawQqDs9udZUxY="; + hash = "sha256-dfr6MiBdCHVscrS6XE0pT67q18NxrtqJliVbbQDFl5g="; }; postPatch = '' diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index 28a50c8053ba1..ff7a50676b469 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "docker"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q1SdDfTT0W+eG/F5HX+pk4B06IG5ZoeZxe36l71gMc8="; + sha256 = "sha256-LFXSfb4JnlacSZVnIf+5/A+KefARYadEGDzGtcSDJBw="; }; vendorHash = null; diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index 74a951f74acfa..c0bead586d508 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2024-05-23"; + version = "0-unstable-2024-06-10"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "8391a9e364622cb7d85e128b427fb96c75e18265"; - hash = "sha256-YHko0lCCn7SydnKbepZpt4Ua6NdvuPD3Y3ZQ1Ysb0+g="; + rev = "19f4185f3967a5c00053236015da22c0da2af41d"; + hash = "sha256-aIoWhjzVmfXv5fcwIBwjUFVjdx316JivKMS+odnEB/I="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/tools/admin/netbox2netshot/default.nix index 47b6dc2e293df..ccaff8f38ecf9 100644 --- a/pkgs/tools/admin/netbox2netshot/default.nix +++ b/pkgs/tools/admin/netbox2netshot/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "Inventory synchronization tool between Netbox and Netshot"; homepage = "https://github.com/scaleway/netbox2netshot"; license = licenses.asl20; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "netbox2netshot"; }; } diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 9e45896512eeb..00d6877f64182 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -15,14 +15,14 @@ let pname = "pgadmin"; - version = "8.8"; - yarnHash = "sha256-dBgbgZrjF1rNyN1Hp1nKiT6C6FVbYdbEZQgYbRKVsYI="; + version = "8.9"; + yarnHash = "sha256-UEQ5gcc4n/XMW5kNol2gLiXUb9Ys75YMzWDXDiDIC9I="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-203tuxtYOn1fD1m8BGL6rt5lDDr5V38ybPy+iwmZpkk="; + hash = "sha256-qxbY4gIXpp5U8RkzdYZUKJ7aTXvuXPGOGTKX41k1iyE="; }; # keep the scope, as it is used throughout the derivation and tests @@ -77,7 +77,7 @@ pythonPackages.buildPythonApplication rec { sed 's|*|0|g' -i requirements.txt # remove packageManager from package.json so we can work without corepack substituteInPlace web/package.json \ - --replace-fail "\"packageManager\": \"yarn@3.6.4\"" "\"\": \"\"" + --replace-fail "\"packageManager\": \"yarn@3.8.2\"" "\"\": \"\"" substituteInPlace pkg/pip/setup_pip.py \ --replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req" ${lib.optionalString (!server-mode) '' diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 2d0d2d44a23b3..d5a752eaa1f9f 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -2,15 +2,10 @@ # yarn lockfile v1 -"@aashutoshrathi/word-wrap@^1.2.3": - version "1.2.6" - resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" - integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== - "@adobe/css-tools@^4.3.2": - version "4.3.3" - resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz#90749bde8b89cd41764224f5aac29cd4138f75ff" - integrity sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ== + version "4.4.0" + resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz#728c484f4e10df03d5a3acd0d8adcbbebff8ad63" + integrity sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ== "@ampproject/remapping@^2.2.0": version "2.3.0" @@ -20,34 +15,34 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2": - version "7.24.2" - resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae" - integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" + integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== dependencies: - "@babel/highlight" "^7.24.2" + "@babel/highlight" "^7.24.7" picocolors "^1.0.0" -"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.5", "@babel/compat-data@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a" - integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ== +"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed" + integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw== "@babel/core@^7.10.2", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.21.3", "@babel/core@^7.23.9": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717" - integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4" + integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.24.2" - "@babel/generator" "^7.24.4" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.24.4" - "@babel/parser" "^7.24.4" - "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.24.7" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helpers" "^7.24.7" + "@babel/parser" "^7.24.7" + "@babel/template" "^7.24.7" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -55,84 +50,85 @@ semver "^6.3.1" "@babel/eslint-parser@^7.21.3": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32" - integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.7.tgz#27ebab1a1ec21f48ae191a8aaac5b82baf80d9c7" + integrity sha512-SO5E3bVxDuxyNxM5agFv480YA2HO6ohZbGxbazZdIk3KQOPOGVNw6q78I9/lbviIf95eq6tPozeYnJLbjnC8IA== dependencies: "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" eslint-visitor-keys "^2.1.0" semver "^6.3.1" "@babel/eslint-plugin@^7.17.7": - version "7.23.5" - resolved "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.23.5.tgz#77d4703e9f83b81e9fc13382810372beb2f10f94" - integrity sha512-03+E/58Hoo/ui69gR+beFdGpplpoVK0BSIdke2iw4/Bz7eGN0ssRenNlnU4nmbkowNQOPCStKSwFr8H6DiY49g== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.24.7.tgz#ebdab31638cdcc720f0c788813066e9b5c0b3e29" + integrity sha512-lODNPJnM+OfcxxBvdmI2YmUeC0fBK3k9yET5O+1Eukr8d5VpO19c6ARtNheE2t2i/8XNYTzp3HeGEAAGZH3nnQ== dependencies: eslint-rule-composer "^0.3.0" -"@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498" - integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw== +"@babel/generator@^7.24.7", "@babel/generator@^7.7.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d" + integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA== dependencies: - "@babel/types" "^7.24.0" + "@babel/types" "^7.24.7" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" - integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== +"@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" + integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.24.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15": - version "7.22.15" - resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956" - integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.24.7.tgz#37d66feb012024f2422b762b9b2a7cfe27c7fba3" + integrity sha512-xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA== dependencies: - "@babel/types" "^7.22.15" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6": - version "7.23.6" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" - integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9" + integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg== dependencies: - "@babel/compat-data" "^7.23.5" - "@babel/helper-validator-option" "^7.23.5" + "@babel/compat-data" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" browserslist "^4.22.2" lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.1", "@babel/helper-create-class-features-plugin@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3" - integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-member-expression-to-functions" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.24.1" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b" + integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-member-expression-to-functions" "^7.24.7" + "@babel/helper-optimise-call-expression" "^7.24.7" + "@babel/helper-replace-supers" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" semver "^6.3.1" -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5": - version "7.22.15" - resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1" - integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.7.tgz#be4f435a80dc2b053c76eeb4b7d16dd22cfc89da" + integrity sha512-03TCmXy2FtXJEZfbXDTSqq1fRJArk7lX9DOFC/47VthYcxyIOx+eXQmdo6DOQvrbpIix+KfXwvuXdFDZHxt+rA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-annotate-as-pure" "^7.24.7" regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.1": - version "0.6.1" - resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd" - integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA== +"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": + version "0.6.2" + resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" + integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -140,181 +136,187 @@ lodash.debounce "^4.0.8" resolve "^1.14.2" -"@babel/helper-environment-visitor@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" - integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== - -"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0": - version "7.23.0" - resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" - integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== - dependencies: - "@babel/template" "^7.22.15" - "@babel/types" "^7.23.0" - -"@babel/helper-hoist-variables@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" - integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== +"@babel/helper-environment-visitor@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9" + integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.24.7" -"@babel/helper-member-expression-to-functions@^7.23.0": - version "7.23.0" - resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366" - integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA== +"@babel/helper-function-name@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2" + integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA== dependencies: - "@babel/types" "^7.23.0" + "@babel/template" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/helper-hoist-variables@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee" + integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ== + dependencies: + "@babel/types" "^7.24.7" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.1", "@babel/helper-module-imports@^7.24.3": - version "7.24.3" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128" - integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg== - dependencies: - "@babel/types" "^7.24.0" - -"@babel/helper-module-transforms@^7.23.3": - version "7.23.3" - resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" - integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.20" - -"@babel/helper-optimise-call-expression@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" - integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.24.0" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" - integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== - -"@babel/helper-remap-async-to-generator@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0" - integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-wrap-function" "^7.22.20" - -"@babel/helper-replace-supers@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz#7085bd19d4a0b7ed8f405c1ed73ccb70f323abc1" - integrity sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-member-expression-to-functions" "^7.23.0" - "@babel/helper-optimise-call-expression" "^7.22.5" - -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-skip-transparent-expression-wrappers@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" - integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-split-export-declaration@^7.22.6": - version "7.22.6" - resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" - integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-string-parser@^7.23.4": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e" - integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ== - -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/helper-validator-option@^7.23.5": - version "7.23.5" - resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" - integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== - -"@babel/helper-wrap-function@^7.22.20": - version "7.22.20" - resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569" - integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw== - dependencies: - "@babel/helper-function-name" "^7.22.5" - "@babel/template" "^7.22.15" - "@babel/types" "^7.22.19" - -"@babel/helpers@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6" - integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw== - dependencies: - "@babel/template" "^7.24.0" - "@babel/traverse" "^7.24.1" - "@babel/types" "^7.24.0" - -"@babel/highlight@^7.24.2": - version "7.24.2" - resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26" - integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA== - dependencies: - "@babel/helper-validator-identifier" "^7.22.20" +"@babel/helper-member-expression-to-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f" + integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w== + dependencies: + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" + integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== + dependencies: + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/helper-module-transforms@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8" + integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ== + dependencies: + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-simple-access" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" + +"@babel/helper-optimise-call-expression@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f" + integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A== + dependencies: + "@babel/types" "^7.24.7" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0" + integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg== + +"@babel/helper-remap-async-to-generator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.7.tgz#b3f0f203628522713849d49403f1a414468be4c7" + integrity sha512-9pKLcTlZ92hNZMQfGCHImUpDOlAgkkpqalWEeftW5FBya75k8Li2ilerxkM/uBEj01iBZXcCIB/bwvDYgWyibA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-wrap-function" "^7.24.7" + +"@babel/helper-replace-supers@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765" + integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg== + dependencies: + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-member-expression-to-functions" "^7.24.7" + "@babel/helper-optimise-call-expression" "^7.24.7" + +"@babel/helper-simple-access@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3" + integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg== + dependencies: + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/helper-skip-transparent-expression-wrappers@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9" + integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ== + dependencies: + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/helper-split-export-declaration@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856" + integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA== + dependencies: + "@babel/types" "^7.24.7" + +"@babel/helper-string-parser@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2" + integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg== + +"@babel/helper-validator-identifier@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" + integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== + +"@babel/helper-validator-option@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6" + integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw== + +"@babel/helper-wrap-function@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.24.7.tgz#52d893af7e42edca7c6d2c6764549826336aae1f" + integrity sha512-N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw== + dependencies: + "@babel/helper-function-name" "^7.24.7" + "@babel/template" "^7.24.7" + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/helpers@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416" + integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg== + dependencies: + "@babel/template" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/highlight@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" + integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== + dependencies: + "@babel/helper-validator-identifier" "^7.24.7" chalk "^2.4.2" js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88" - integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85" + integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw== -"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1" - integrity sha512-qpl6vOOEEzTLLcsuqYYo8yDtrTocmu2xkGvgNebvPjT9DTtfFYGmgDqY+rBYXNlqL4s9qLDn6xkrJv4RxAPiTA== +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7.tgz#fd059fd27b184ea2b4c7e646868a9a381bbc3055" + integrity sha512-TiT1ss81W80eQsN+722OaeQMY/G4yTb4G9JrqeiDADs3N8lbPMGldWi9x8tyqCW5NLx1Jh2AvkE6r6QvEltMMQ== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz#b645d9ba8c2bc5b7af50f0fe949f9edbeb07c8cf" - integrity sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7.tgz#468096ca44bbcbe8fcc570574e12eb1950e18107" + integrity sha512-unaQgZ/iRu/By6tsjMZzpeBZjChYfLYry6HrEXPoz3KmfF0sVBQ1l8zKMQ4xRGLWVsjuvB8nQfjNP/DcfEOCsg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz#da8261f2697f0f41b0855b91d3a20a1fbfd271d3" - integrity sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7.tgz#e4eabdd5109acc399b38d7999b2ef66fc2022f89" + integrity sha512-+izXIbke1T33mY4MSNnrqhPXDz01WYhEf3yF5NbnUtkiNnm+XBZJl3kNfoK6NKmYlz/D07+l2GWVK/QfDkNCuQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/plugin-transform-optional-chaining" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" + "@babel/plugin-transform-optional-chaining" "^7.24.7" -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz#1181d9685984c91d657b8ddf14f0487a6bab2988" - integrity sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw== +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7.tgz#71b21bb0286d5810e63a1538aa901c58e87375ec" + integrity sha512-utA4HuR6F4Vvcr+o4DnjL8fCOlgRFGbeeBEGNg3ZTrLFw6VWG5XmUrvcQ0FjIYMU2ST4XcR2Wsp7t9qOAPnxMg== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-proposal-class-properties@^7.10.4": version "7.18.6" @@ -382,19 +384,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-import-assertions@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz#db3aad724153a00eaac115a3fb898de544e34971" - integrity sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ== +"@babel/plugin-syntax-import-assertions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778" + integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-syntax-import-attributes@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz#c66b966c63b714c4eec508fcf5763b1f2d381093" - integrity sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA== +"@babel/plugin-syntax-import-attributes@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca" + integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -410,12 +412,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.23.3", "@babel/plugin-syntax-jsx@^7.24.1", "@babel/plugin-syntax-jsx@^7.7.2": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10" - integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA== +"@babel/plugin-syntax-jsx@^7.16.0", "@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.24.7", "@babel/plugin-syntax-jsx@^7.7.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d" + integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -473,12 +475,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.24.1", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844" - integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw== +"@babel/plugin-syntax-typescript@^7.24.7", "@babel/plugin-syntax-typescript@^7.7.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz#58d458271b4d3b6bb27ee6ac9525acbb259bad1c" + integrity sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-unicode-sets-regex@^7.18.6": version "7.18.6" @@ -488,476 +490,476 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-arrow-functions@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz#2bf263617060c9cc45bcdbf492b8cc805082bf27" - integrity sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw== +"@babel/plugin-transform-arrow-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514" + integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-async-generator-functions@^7.24.3": - version "7.24.3" - resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz#8fa7ae481b100768cc9842c8617808c5352b8b89" - integrity sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg== +"@babel/plugin-transform-async-generator-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz#7330a5c50e05181ca52351b8fd01642000c96cfd" + integrity sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-remap-async-to-generator" "^7.22.20" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-remap-async-to-generator" "^7.24.7" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-transform-async-to-generator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz#0e220703b89f2216800ce7b1c53cb0cf521c37f4" - integrity sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw== +"@babel/plugin-transform-async-to-generator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz#72a3af6c451d575842a7e9b5a02863414355bdcc" + integrity sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA== dependencies: - "@babel/helper-module-imports" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-remap-async-to-generator" "^7.22.20" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-remap-async-to-generator" "^7.24.7" -"@babel/plugin-transform-block-scoped-functions@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz#1c94799e20fcd5c4d4589523bbc57b7692979380" - integrity sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg== +"@babel/plugin-transform-block-scoped-functions@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f" + integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-block-scoping@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.4.tgz#28f5c010b66fbb8ccdeef853bef1935c434d7012" - integrity sha512-nIFUZIpGKDf9O9ttyRXpHFpKC+X3Y5mtshZONuEUYBomAKoM4y029Jr+uB1bHGPhNmK8YXHevDtKDOLmtRrp6g== +"@babel/plugin-transform-block-scoping@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz#42063e4deb850c7bd7c55e626bf4e7ab48e6ce02" + integrity sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-class-properties@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz#bcbf1aef6ba6085cfddec9fc8d58871cf011fc29" - integrity sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g== +"@babel/plugin-transform-class-properties@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz#256879467b57b0b68c7ddfc5b76584f398cd6834" + integrity sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-class-static-block@^7.24.4": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz#1a4653c0cf8ac46441ec406dece6e9bc590356a4" - integrity sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg== +"@babel/plugin-transform-class-static-block@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.7.tgz#c82027ebb7010bc33c116d4b5044fbbf8c05484d" + integrity sha512-HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.4" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-transform-classes@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz#5bc8fc160ed96378184bc10042af47f50884dcb1" - integrity sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-replace-supers" "^7.24.1" - "@babel/helper-split-export-declaration" "^7.22.6" +"@babel/plugin-transform-classes@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz#4ae6ef43a12492134138c1e45913f7c46c41b4bf" + integrity sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-replace-supers" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz#bc7e787f8e021eccfb677af5f13c29a9934ed8a7" - integrity sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw== +"@babel/plugin-transform-computed-properties@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707" + integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/template" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/template" "^7.24.7" -"@babel/plugin-transform-destructuring@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz#b1e8243af4a0206841973786292b8c8dd8447345" - integrity sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw== +"@babel/plugin-transform-destructuring@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz#a097f25292defb6e6cc16d6333a4cfc1e3c72d9e" + integrity sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-dotall-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz#d56913d2f12795cc9930801b84c6f8c47513ac13" - integrity sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw== +"@babel/plugin-transform-dotall-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.7.tgz#5f8bf8a680f2116a7207e16288a5f974ad47a7a0" + integrity sha512-ZOA3W+1RRTSWvyqcMJDLqbchh7U4NRGqwRfFSVbOLS/ePIP4vHB5e8T8eXcuqyN1QkgKyj5wuW0lcS85v4CrSw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-duplicate-keys@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz#5347a797fe82b8d09749d10e9f5b83665adbca88" - integrity sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA== +"@babel/plugin-transform-duplicate-keys@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.7.tgz#dd20102897c9a2324e5adfffb67ff3610359a8ee" + integrity sha512-JdYfXyCRihAe46jUIliuL2/s0x0wObgwwiGxw/UbgJBr20gQBThrokO4nYKgWkD7uBaqM7+9x5TU7NkExZJyzw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-dynamic-import@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz#2a5a49959201970dd09a5fca856cb651e44439dd" - integrity sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA== +"@babel/plugin-transform-dynamic-import@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz#4d8b95e3bae2b037673091aa09cd33fecd6419f4" + integrity sha512-sc3X26PhZQDb3JhORmakcbvkeInvxz+A8oda99lj7J60QRuPZvNAk9wQlTBS1ZynelDrDmTU4pw1tyc5d5ZMUg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-transform-exponentiation-operator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz#6650ebeb5bd5c012d5f5f90a26613a08162e8ba4" - integrity sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw== +"@babel/plugin-transform-exponentiation-operator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.7.tgz#b629ee22645f412024297d5245bce425c31f9b0d" + integrity sha512-Rqe/vSc9OYgDajNIK35u7ot+KeCoetqQYFXM4Epf7M7ez3lWlOjrDjrwMei6caCVhfdw+mIKD4cgdGNy5JQotQ== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-export-namespace-from@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz#f033541fc036e3efb2dcb58eedafd4f6b8078acd" - integrity sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ== +"@babel/plugin-transform-export-namespace-from@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.7.tgz#176d52d8d8ed516aeae7013ee9556d540c53f197" + integrity sha512-v0K9uNYsPL3oXZ/7F9NNIbAj2jv1whUEtyA6aujhekLs56R++JDQuzRcP2/z4WX5Vg/c5lE9uWZA0/iUoFhLTA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-transform-for-of@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz#67448446b67ab6c091360ce3717e7d3a59e202fd" - integrity sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg== +"@babel/plugin-transform-for-of@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70" + integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-function-name@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz#8cba6f7730626cc4dfe4ca2fa516215a0592b361" - integrity sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA== +"@babel/plugin-transform-function-name@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz#6d8601fbffe665c894440ab4470bc721dd9131d6" + integrity sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w== dependencies: - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-json-strings@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz#08e6369b62ab3e8a7b61089151b161180c8299f7" - integrity sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ== +"@babel/plugin-transform-json-strings@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.7.tgz#f3e9c37c0a373fee86e36880d45b3664cedaf73a" + integrity sha512-2yFnBGDvRuxAaE/f0vfBKvtnvvqU8tGpMHqMNpTN2oWMKIR3NqFkjaAgGwawhqK/pIN2T3XdjGPdaG0vDhOBGw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-transform-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz#0a1982297af83e6b3c94972686067df588c5c096" - integrity sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g== +"@babel/plugin-transform-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz#36b505c1e655151a9d7607799a9988fc5467d06c" + integrity sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-logical-assignment-operators@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz#719d8aded1aa94b8fb34e3a785ae8518e24cfa40" - integrity sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w== +"@babel/plugin-transform-logical-assignment-operators@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.7.tgz#a58fb6eda16c9dc8f9ff1c7b1ba6deb7f4694cb0" + integrity sha512-4D2tpwlQ1odXmTEIFWy9ELJcZHqrStlzK/dAOWYyxX3zT0iXQB6banjgeOJQXzEc4S0E0a5A+hahxPaEFYftsw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-transform-member-expression-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz#896d23601c92f437af8b01371ad34beb75df4489" - integrity sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg== +"@babel/plugin-transform-member-expression-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df" + integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-amd@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz#b6d829ed15258536977e9c7cc6437814871ffa39" - integrity sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ== +"@babel/plugin-transform-modules-amd@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.7.tgz#65090ed493c4a834976a3ca1cde776e6ccff32d7" + integrity sha512-9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg== dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-modules-commonjs@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz#e71ba1d0d69e049a22bf90b3867e263823d3f1b9" - integrity sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw== +"@babel/plugin-transform-modules-commonjs@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz#9fd5f7fdadee9085886b183f1ad13d1ab260f4ab" + integrity sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ== dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-simple-access" "^7.24.7" -"@babel/plugin-transform-modules-systemjs@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz#2b9625a3d4e445babac9788daec39094e6b11e3e" - integrity sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA== +"@babel/plugin-transform-modules-systemjs@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.7.tgz#f8012316c5098f6e8dee6ecd58e2bc6f003d0ce7" + integrity sha512-GYQE0tW7YoaN13qFh3O1NCY4MPkUiAH3fiF7UcV/I3ajmDKEdG3l+UOcbAm4zUE3gnvUU+Eni7XrVKo9eO9auw== dependencies: - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-hoist-variables" "^7.24.7" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" -"@babel/plugin-transform-modules-umd@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz#69220c66653a19cf2c0872b9c762b9a48b8bebef" - integrity sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg== +"@babel/plugin-transform-modules-umd@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.7.tgz#edd9f43ec549099620df7df24e7ba13b5c76efc8" + integrity sha512-3aytQvqJ/h9z4g8AsKPLvD4Zqi2qT+L3j7XoFFu1XBlZWEl2/1kWnhmAbxpLgPrHSY0M6UA02jyTiwUVtiKR6A== dependencies: - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-module-transforms" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f" - integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ== +"@babel/plugin-transform-named-capturing-groups-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.7.tgz#9042e9b856bc6b3688c0c2e4060e9e10b1460923" + integrity sha512-/jr7h/EWeJtk1U/uz2jlsCioHkZk1JJZVcc8oQsJ1dUlaJD83f4/6Zeh2aHt9BIFokHIsSeDfhUmju0+1GPd6g== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-new-target@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz#29c59988fa3d0157de1c871a28cd83096363cc34" - integrity sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug== +"@babel/plugin-transform-new-target@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.7.tgz#31ff54c4e0555cc549d5816e4ab39241dfb6ab00" + integrity sha512-RNKwfRIXg4Ls/8mMTza5oPF5RkOW8Wy/WgMAp1/F1yZ8mMbtwXW+HDoJiOsagWrAhI5f57Vncrmr9XeT4CVapA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-nullish-coalescing-operator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz#0cd494bb97cb07d428bd651632cb9d4140513988" - integrity sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw== +"@babel/plugin-transform-nullish-coalescing-operator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.7.tgz#1de4534c590af9596f53d67f52a92f12db984120" + integrity sha512-Ts7xQVk1OEocqzm8rHMXHlxvsfZ0cEF2yomUqpKENHWMF4zKk175Y4q8H5knJes6PgYad50uuRmt3UJuhBw8pQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-transform-numeric-separator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz#5bc019ce5b3435c1cadf37215e55e433d674d4e8" - integrity sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw== +"@babel/plugin-transform-numeric-separator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.7.tgz#bea62b538c80605d8a0fac9b40f48e97efa7de63" + integrity sha512-e6q1TiVUzvH9KRvicuxdBTUj4AdKSRwzIyFFnfnezpCfP2/7Qmbb8qbU2j7GODbl4JMkblitCQjKYUaX/qkkwA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-transform-object-rest-spread@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz#5a3ce73caf0e7871a02e1c31e8b473093af241ff" - integrity sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA== +"@babel/plugin-transform-object-rest-spread@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.7.tgz#d13a2b93435aeb8a197e115221cab266ba6e55d6" + integrity sha512-4QrHAr0aXQCEFni2q4DqKLD31n2DL+RxcwnNjDFkSG0eNQ/xCavnRkfCUjsyqGC2OviNJvZOF/mQqZBw7i2C5Q== dependencies: - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.24.1" + "@babel/plugin-transform-parameters" "^7.24.7" -"@babel/plugin-transform-object-super@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz#e71d6ab13483cca89ed95a474f542bbfc20a0520" - integrity sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ== +"@babel/plugin-transform-object-super@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be" + integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-replace-supers" "^7.24.1" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-replace-supers" "^7.24.7" -"@babel/plugin-transform-optional-catch-binding@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz#92a3d0efe847ba722f1a4508669b23134669e2da" - integrity sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA== +"@babel/plugin-transform-optional-catch-binding@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.7.tgz#00eabd883d0dd6a60c1c557548785919b6e717b4" + integrity sha512-uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-transform-optional-chaining@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz#26e588acbedce1ab3519ac40cc748e380c5291e6" - integrity sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg== +"@babel/plugin-transform-optional-chaining@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz#b8f6848a80cf2da98a8a204429bec04756c6d454" + integrity sha512-tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz#983c15d114da190506c75b616ceb0f817afcc510" - integrity sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg== +"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68" + integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-methods@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz#a0faa1ae87eff077e1e47a5ec81c3aef383dc15a" - integrity sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw== +"@babel/plugin-transform-private-methods@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz#e6318746b2ae70a59d023d5cc1344a2ba7a75f5e" + integrity sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-private-property-in-object@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz#756443d400274f8fb7896742962cc1b9f25c1f6a" - integrity sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg== +"@babel/plugin-transform-private-property-in-object@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.7.tgz#4eec6bc701288c1fab5f72e6a4bbc9d67faca061" + integrity sha512-9z76mxwnwFxMyxZWEgdgECQglF2Q7cFLm0kMf8pGwt+GSJsY0cONKj/UuO4bOH0w/uAel3ekS4ra5CEAyJRmDA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.24.1" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-transform-property-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz#d6a9aeab96f03749f4eebeb0b6ea8e90ec958825" - integrity sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA== +"@babel/plugin-transform-property-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc" + integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-transform-react-constant-elements@^7.21.3": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.24.1.tgz#d493a0918b9fdad7540f5afd9b5eb5c52500d18d" - integrity sha512-QXp1U9x0R7tkiGB0FOk8o74jhnap0FlZ5gNkRIWdG3eP+SvMFg118e1zaWewDzgABb106QSKpVsD3Wgd8t6ifA== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.24.7.tgz#b85e8f240b14400277f106c9c9b585d9acf608a1" + integrity sha512-7LidzZfUXyfZ8/buRW6qIIHBY8wAZ1OrY9c/wTr8YhZ6vMPo+Uc/CVFLYY1spZrEQlD4w5u8wjqk5NQ3OVqQKA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-react-display-name@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz#554e3e1a25d181f040cf698b93fd289a03bfdcdb" - integrity sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw== +"@babel/plugin-transform-react-display-name@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz#9caff79836803bc666bcfe210aeb6626230c293b" + integrity sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-react-jsx-development@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87" - integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A== +"@babel/plugin-transform-react-jsx-development@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz#eaee12f15a93f6496d852509a850085e6361470b" + integrity sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ== dependencies: - "@babel/plugin-transform-react-jsx" "^7.22.5" + "@babel/plugin-transform-react-jsx" "^7.24.7" -"@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.23.4": - version "7.23.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312" - integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA== +"@babel/plugin-transform-react-jsx@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz#17cd06b75a9f0e2bd076503400e7c4b99beedac4" + integrity sha512-+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-jsx" "^7.23.3" - "@babel/types" "^7.23.4" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/plugin-syntax-jsx" "^7.24.7" + "@babel/types" "^7.24.7" -"@babel/plugin-transform-react-pure-annotations@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.1.tgz#c86bce22a53956331210d268e49a0ff06e392470" - integrity sha512-+pWEAaDJvSm9aFvJNpLiM2+ktl2Sn2U5DdyiWdZBxmLc6+xGt88dvFqsHiAiDS+8WqUwbDfkKz9jRxK3M0k+kA== +"@babel/plugin-transform-react-pure-annotations@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.7.tgz#bdd9d140d1c318b4f28b29a00fb94f97ecab1595" + integrity sha512-PLgBVk3fzbmEjBJ/u8kFzOqS9tUeDjiaWud/rRym/yjCo/M9cASPlnrd2ZmmZpQT40fOOrvR8jh+n8jikrOhNA== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-regenerator@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz#625b7545bae52363bdc1fbbdc7252b5046409c8c" - integrity sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw== +"@babel/plugin-transform-regenerator@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.7.tgz#021562de4534d8b4b1851759fd7af4e05d2c47f8" + integrity sha512-lq3fvXPdimDrlg6LWBoqj+r/DEWgONuwjuOuQCSYgRroXDH/IdM1C0IZf59fL5cHLpjEH/O6opIRBbqv7ELnuA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" regenerator-transform "^0.15.2" -"@babel/plugin-transform-reserved-words@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz#8de729f5ecbaaf5cf83b67de13bad38a21be57c1" - integrity sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg== +"@babel/plugin-transform-reserved-words@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.7.tgz#80037fe4fbf031fc1125022178ff3938bb3743a4" + integrity sha512-0DUq0pHcPKbjFZCfTss/pGkYMfy3vFWydkUBd9r0GHpIyfs2eCDENvqadMycRS9wZCXR41wucAfJHJmwA0UmoQ== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/plugin-transform-runtime@^7.22.15": - version "7.24.3" - resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.3.tgz#dc58ad4a31810a890550365cc922e1ff5acb5d7f" - integrity sha512-J0BuRPNlNqlMTRJ72eVptpt9VcInbxO6iP3jaxr+1NPhC0UkKL+6oeX6VXMEYdADnuqmMmsBspt4d5w8Y/TCbQ== + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz#00a5bfaf8c43cf5c8703a8a6e82b59d9c58f38ca" + integrity sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw== dependencies: - "@babel/helper-module-imports" "^7.24.3" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" babel-plugin-polyfill-corejs2 "^0.4.10" babel-plugin-polyfill-corejs3 "^0.10.1" babel-plugin-polyfill-regenerator "^0.6.1" semver "^6.3.1" -"@babel/plugin-transform-shorthand-properties@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55" - integrity sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA== +"@babel/plugin-transform-shorthand-properties@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73" + integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-spread@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz#a1acf9152cbf690e4da0ba10790b3ac7d2b2b391" - integrity sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g== +"@babel/plugin-transform-spread@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3" + integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7" -"@babel/plugin-transform-sticky-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz#f03e672912c6e203ed8d6e0271d9c2113dc031b9" - integrity sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw== +"@babel/plugin-transform-sticky-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.7.tgz#96ae80d7a7e5251f657b5cf18f1ea6bf926f5feb" + integrity sha512-kHPSIJc9v24zEml5geKg9Mjx5ULpfncj0wRpYtxbvKyTtHCYDkVE3aHQ03FrpEo4gEe2vrJJS1Y9CJTaThA52g== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-template-literals@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz#15e2166873a30d8617e3e2ccadb86643d327aab7" - integrity sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g== +"@babel/plugin-transform-template-literals@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8" + integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-typeof-symbol@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz#6831f78647080dec044f7e9f68003d99424f94c7" - integrity sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA== +"@babel/plugin-transform-typeof-symbol@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz#f074be466580d47d6e6b27473a840c9f9ca08fb0" + integrity sha512-VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-typescript@^7.24.1": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz#03e0492537a4b953e491f53f2bc88245574ebd15" - integrity sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g== +"@babel/plugin-transform-typescript@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.7.tgz#b006b3e0094bf0813d505e0c5485679eeaf4a881" + integrity sha512-iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw== dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.24.4" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/plugin-syntax-typescript" "^7.24.1" + "@babel/helper-annotate-as-pure" "^7.24.7" + "@babel/helper-create-class-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/plugin-syntax-typescript" "^7.24.7" -"@babel/plugin-transform-unicode-escapes@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz#fb3fa16676549ac7c7449db9b342614985c2a3a4" - integrity sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw== +"@babel/plugin-transform-unicode-escapes@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.7.tgz#2023a82ced1fb4971630a2e079764502c4148e0e" + integrity sha512-U3ap1gm5+4edc2Q/P+9VrBNhGkfnf+8ZqppY71Bo/pzZmXhhLdqgaUl6cuB07O1+AQJtCLfaOmswiNbSQ9ivhw== dependencies: - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-property-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz#56704fd4d99da81e5e9f0c0c93cabd91dbc4889e" - integrity sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng== +"@babel/plugin-transform-unicode-property-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.7.tgz#9073a4cd13b86ea71c3264659590ac086605bbcd" + integrity sha512-uH2O4OV5M9FZYQrwc7NdVmMxQJOCCzFeYudlZSzUAHRFeOujQefa92E74TQDVskNHCzOXoigEuoyzHDhaEaK5w== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz#57c3c191d68f998ac46b708380c1ce4d13536385" - integrity sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g== +"@babel/plugin-transform-unicode-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.7.tgz#dfc3d4a51127108099b19817c0963be6a2adf19f" + integrity sha512-hlQ96MBZSAXUq7ltkjtu3FJCCSMx/j629ns3hA3pXnBXjanNP0LHi+JpPeA81zaWgVK1VGH95Xuy7u0RyQ8kMg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-transform-unicode-sets-regex@^7.24.1": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz#c1ea175b02afcffc9cf57a9c4658326625165b7f" - integrity sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA== +"@babel/plugin-transform-unicode-sets-regex@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz#d40705d67523803a576e29c63cef6e516b858ed9" + integrity sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.22.15" - "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-create-regexp-features-plugin" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" "@babel/preset-env@^7.10.2", "@babel/preset-env@^7.20.2": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.4.tgz#46dbbcd608771373b88f956ffb67d471dce0d23b" - integrity sha512-7Kl6cSmYkak0FK/FXjSEnLJ1N9T/WA2RkMhu17gZ/dsxKJUuTYNIylahPTzqpLyJN4WhDif8X0XK1R8Wsguo/A== - dependencies: - "@babel/compat-data" "^7.24.4" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.4" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.1" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.1" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.1" + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz#ff067b4e30ba4a72f225f12f123173e77b987f37" + integrity sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ== + dependencies: + "@babel/compat-data" "^7.24.7" + "@babel/helper-compilation-targets" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.24.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.24.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.24.7" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.24.7" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-import-assertions" "^7.24.1" - "@babel/plugin-syntax-import-attributes" "^7.24.1" + "@babel/plugin-syntax-import-assertions" "^7.24.7" + "@babel/plugin-syntax-import-attributes" "^7.24.7" "@babel/plugin-syntax-import-meta" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.3" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" @@ -969,54 +971,54 @@ "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" - "@babel/plugin-transform-arrow-functions" "^7.24.1" - "@babel/plugin-transform-async-generator-functions" "^7.24.3" - "@babel/plugin-transform-async-to-generator" "^7.24.1" - "@babel/plugin-transform-block-scoped-functions" "^7.24.1" - "@babel/plugin-transform-block-scoping" "^7.24.4" - "@babel/plugin-transform-class-properties" "^7.24.1" - "@babel/plugin-transform-class-static-block" "^7.24.4" - "@babel/plugin-transform-classes" "^7.24.1" - "@babel/plugin-transform-computed-properties" "^7.24.1" - "@babel/plugin-transform-destructuring" "^7.24.1" - "@babel/plugin-transform-dotall-regex" "^7.24.1" - "@babel/plugin-transform-duplicate-keys" "^7.24.1" - "@babel/plugin-transform-dynamic-import" "^7.24.1" - "@babel/plugin-transform-exponentiation-operator" "^7.24.1" - "@babel/plugin-transform-export-namespace-from" "^7.24.1" - "@babel/plugin-transform-for-of" "^7.24.1" - "@babel/plugin-transform-function-name" "^7.24.1" - "@babel/plugin-transform-json-strings" "^7.24.1" - "@babel/plugin-transform-literals" "^7.24.1" - "@babel/plugin-transform-logical-assignment-operators" "^7.24.1" - "@babel/plugin-transform-member-expression-literals" "^7.24.1" - "@babel/plugin-transform-modules-amd" "^7.24.1" - "@babel/plugin-transform-modules-commonjs" "^7.24.1" - "@babel/plugin-transform-modules-systemjs" "^7.24.1" - "@babel/plugin-transform-modules-umd" "^7.24.1" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5" - "@babel/plugin-transform-new-target" "^7.24.1" - "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.1" - "@babel/plugin-transform-numeric-separator" "^7.24.1" - "@babel/plugin-transform-object-rest-spread" "^7.24.1" - "@babel/plugin-transform-object-super" "^7.24.1" - "@babel/plugin-transform-optional-catch-binding" "^7.24.1" - "@babel/plugin-transform-optional-chaining" "^7.24.1" - "@babel/plugin-transform-parameters" "^7.24.1" - "@babel/plugin-transform-private-methods" "^7.24.1" - "@babel/plugin-transform-private-property-in-object" "^7.24.1" - "@babel/plugin-transform-property-literals" "^7.24.1" - "@babel/plugin-transform-regenerator" "^7.24.1" - "@babel/plugin-transform-reserved-words" "^7.24.1" - "@babel/plugin-transform-shorthand-properties" "^7.24.1" - "@babel/plugin-transform-spread" "^7.24.1" - "@babel/plugin-transform-sticky-regex" "^7.24.1" - "@babel/plugin-transform-template-literals" "^7.24.1" - "@babel/plugin-transform-typeof-symbol" "^7.24.1" - "@babel/plugin-transform-unicode-escapes" "^7.24.1" - "@babel/plugin-transform-unicode-property-regex" "^7.24.1" - "@babel/plugin-transform-unicode-regex" "^7.24.1" - "@babel/plugin-transform-unicode-sets-regex" "^7.24.1" + "@babel/plugin-transform-arrow-functions" "^7.24.7" + "@babel/plugin-transform-async-generator-functions" "^7.24.7" + "@babel/plugin-transform-async-to-generator" "^7.24.7" + "@babel/plugin-transform-block-scoped-functions" "^7.24.7" + "@babel/plugin-transform-block-scoping" "^7.24.7" + "@babel/plugin-transform-class-properties" "^7.24.7" + "@babel/plugin-transform-class-static-block" "^7.24.7" + "@babel/plugin-transform-classes" "^7.24.7" + "@babel/plugin-transform-computed-properties" "^7.24.7" + "@babel/plugin-transform-destructuring" "^7.24.7" + "@babel/plugin-transform-dotall-regex" "^7.24.7" + "@babel/plugin-transform-duplicate-keys" "^7.24.7" + "@babel/plugin-transform-dynamic-import" "^7.24.7" + "@babel/plugin-transform-exponentiation-operator" "^7.24.7" + "@babel/plugin-transform-export-namespace-from" "^7.24.7" + "@babel/plugin-transform-for-of" "^7.24.7" + "@babel/plugin-transform-function-name" "^7.24.7" + "@babel/plugin-transform-json-strings" "^7.24.7" + "@babel/plugin-transform-literals" "^7.24.7" + "@babel/plugin-transform-logical-assignment-operators" "^7.24.7" + "@babel/plugin-transform-member-expression-literals" "^7.24.7" + "@babel/plugin-transform-modules-amd" "^7.24.7" + "@babel/plugin-transform-modules-commonjs" "^7.24.7" + "@babel/plugin-transform-modules-systemjs" "^7.24.7" + "@babel/plugin-transform-modules-umd" "^7.24.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.24.7" + "@babel/plugin-transform-new-target" "^7.24.7" + "@babel/plugin-transform-nullish-coalescing-operator" "^7.24.7" + "@babel/plugin-transform-numeric-separator" "^7.24.7" + "@babel/plugin-transform-object-rest-spread" "^7.24.7" + "@babel/plugin-transform-object-super" "^7.24.7" + "@babel/plugin-transform-optional-catch-binding" "^7.24.7" + "@babel/plugin-transform-optional-chaining" "^7.24.7" + "@babel/plugin-transform-parameters" "^7.24.7" + "@babel/plugin-transform-private-methods" "^7.24.7" + "@babel/plugin-transform-private-property-in-object" "^7.24.7" + "@babel/plugin-transform-property-literals" "^7.24.7" + "@babel/plugin-transform-regenerator" "^7.24.7" + "@babel/plugin-transform-reserved-words" "^7.24.7" + "@babel/plugin-transform-shorthand-properties" "^7.24.7" + "@babel/plugin-transform-spread" "^7.24.7" + "@babel/plugin-transform-sticky-regex" "^7.24.7" + "@babel/plugin-transform-template-literals" "^7.24.7" + "@babel/plugin-transform-typeof-symbol" "^7.24.7" + "@babel/plugin-transform-unicode-escapes" "^7.24.7" + "@babel/plugin-transform-unicode-property-regex" "^7.24.7" + "@babel/plugin-transform-unicode-regex" "^7.24.7" + "@babel/plugin-transform-unicode-sets-regex" "^7.24.7" "@babel/preset-modules" "0.1.6-no-external-plugins" babel-plugin-polyfill-corejs2 "^0.4.10" babel-plugin-polyfill-corejs3 "^0.10.4" @@ -1034,72 +1036,72 @@ esutils "^2.0.2" "@babel/preset-react@^7.12.13", "@babel/preset-react@^7.18.6": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.1.tgz#2450c2ac5cc498ef6101a6ca5474de251e33aa95" - integrity sha512-eFa8up2/8cZXLIpkafhaADTXSnl7IsUFCYenRWrARBz0/qZwcT0RBXpys0LJU4+WfPoF2ZG6ew6s2V6izMCwRA== - dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-transform-react-display-name" "^7.24.1" - "@babel/plugin-transform-react-jsx" "^7.23.4" - "@babel/plugin-transform-react-jsx-development" "^7.22.5" - "@babel/plugin-transform-react-pure-annotations" "^7.24.1" - -"@babel/preset-typescript@^7.21.0", "@babel/preset-typescript@^7.22.5": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec" - integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ== - dependencies: - "@babel/helper-plugin-utils" "^7.24.0" - "@babel/helper-validator-option" "^7.23.5" - "@babel/plugin-syntax-jsx" "^7.24.1" - "@babel/plugin-transform-modules-commonjs" "^7.24.1" - "@babel/plugin-transform-typescript" "^7.24.1" + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz#480aeb389b2a798880bf1f889199e3641cbb22dc" + integrity sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag== + dependencies: + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" + "@babel/plugin-transform-react-display-name" "^7.24.7" + "@babel/plugin-transform-react-jsx" "^7.24.7" + "@babel/plugin-transform-react-jsx-development" "^7.24.7" + "@babel/plugin-transform-react-pure-annotations" "^7.24.7" + +"@babel/preset-typescript@^7.21.0", "@babel/preset-typescript@^7.24.7": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.7.tgz#66cd86ea8f8c014855671d5ea9a737139cbbfef1" + integrity sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-validator-option" "^7.24.7" + "@babel/plugin-syntax-jsx" "^7.24.7" + "@babel/plugin-transform-modules-commonjs" "^7.24.7" + "@babel/plugin-transform-typescript" "^7.24.7" "@babel/regjsgen@^0.8.0": version "0.8.0" resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.24.4" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd" - integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.6", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12" + integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3": - version "7.24.0" - resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50" - integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA== - dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/parser" "^7.24.0" - "@babel/types" "^7.24.0" - -"@babel/traverse@^7.24.1", "@babel/traverse@^7.4.5": - version "7.24.1" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c" - integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ== - dependencies: - "@babel/code-frame" "^7.24.1" - "@babel/generator" "^7.24.1" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.24.1" - "@babel/types" "^7.24.0" +"@babel/template@^7.24.7", "@babel/template@^7.3.3": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315" + integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig== + dependencies: + "@babel/code-frame" "^7.24.7" + "@babel/parser" "^7.24.7" + "@babel/types" "^7.24.7" + +"@babel/traverse@^7.24.7", "@babel/traverse@^7.4.5": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5" + integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA== + dependencies: + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.24.7" + "@babel/helper-environment-visitor" "^7.24.7" + "@babel/helper-function-name" "^7.24.7" + "@babel/helper-hoist-variables" "^7.24.7" + "@babel/helper-split-export-declaration" "^7.24.7" + "@babel/parser" "^7.24.7" + "@babel/types" "^7.24.7" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.8.3": - version "7.24.0" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf" - integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.8.3": + version "7.24.7" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2" + integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-string-parser" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1108,9 +1110,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@codemirror/autocomplete@^6.0.0": - version "6.16.0" - resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.0.tgz#595eb30099ba91a835ed65ed8ff7497388f604b3" - integrity sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg== + version "6.16.2" + resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.2.tgz#ac4e191cd599503e45f35e97366b432d30b8f37a" + integrity sha512-MjfDrHy0gHKlPWsvSsikhO1+BOh+eBHNgfH1OXs1+DAf30IonQldgMM3kxLDTG9ktE7kDLaA1j/l7KMPA4KNfw== dependencies: "@codemirror/language" "^6.0.0" "@codemirror/state" "^6.0.0" @@ -1118,19 +1120,19 @@ "@lezer/common" "^1.0.0" "@codemirror/commands@^6.0.0": - version "6.4.0" - resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.4.0.tgz#be4538b98b9f4f6f2f43a178622be6540be5a18a" - integrity sha512-HB3utD5GxCvEhSyj5EuG9KpuQQhFpxalh3lwrspyL/GeSNDe4c6JDxVzL12SJ+7gUknHjZzmq7OPCb9QPgiRmQ== + version "6.6.0" + resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz#d308f143fe1b8896ca25fdb855f66acdaf019dd4" + integrity sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg== dependencies: "@codemirror/language" "^6.0.0" "@codemirror/state" "^6.4.0" - "@codemirror/view" "^6.0.0" + "@codemirror/view" "^6.27.0" "@lezer/common" "^1.1.0" -"@codemirror/lang-sql@^6.6.3": - version "6.6.3" - resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.6.3.tgz#627cb54c91e1df376f7be4f97e6922195a9d6537" - integrity sha512-fo5i3OD/7TmmqMtKycC4OaqfPsRxk0sKOb35g8cOtyUyyI2hfP2qXkDc7Asb6h7BiJK+MU/DYVPnQm6iNB5ZTw== +"@codemirror/lang-sql@^6.6.5": + version "6.6.5" + resolved "https://registry.npmjs.org/@codemirror/lang-sql/-/lang-sql-6.6.5.tgz#696c7e7bbc0b4ab2b40794fa5b3edbeb7e4dd4c8" + integrity sha512-noy8Hp+4rng6HM0647hvN5hXVefd9o6tar+9p/vV7pj14zsRBaVQvtl6w7cLs1dGPllSsDmnN8R+gAsjnEs6mA== dependencies: "@codemirror/autocomplete" "^6.0.0" "@codemirror/language" "^6.0.0" @@ -1140,9 +1142,9 @@ "@lezer/lr" "^1.0.0" "@codemirror/language@^6.0.0": - version "6.10.1" - resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz#428c932a158cb75942387acfe513c1ece1090b05" - integrity sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ== + version "6.10.2" + resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz#4056dc219619627ffe995832eeb09cea6060be61" + integrity sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA== dependencies: "@codemirror/state" "^6.0.0" "@codemirror/view" "^6.23.0" @@ -1152,9 +1154,9 @@ style-mod "^4.0.0" "@codemirror/lint@^6.0.0": - version "6.5.0" - resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz#ea43b6e653dcc5bcd93456b55e9fe62e63f326d9" - integrity sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g== + version "6.8.0" + resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.0.tgz#cf9067c7041c1f6c9f20bab411dac9323aab54f0" + integrity sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA== dependencies: "@codemirror/state" "^6.0.0" "@codemirror/view" "^6.0.0" @@ -1174,10 +1176,10 @@ resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b" integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A== -"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0": - version "6.26.3" - resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.26.3.tgz#47aebd49a6ee3c8d36b82046d3bffe6056b8039f" - integrity sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw== +"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0": + version "6.27.0" + resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.27.0.tgz#829882b171106bc50b4f17b7e5d2f7277832c92f" + integrity sha512-8kqX1sHbVW1lVzWwrjAbh4dR7eKhV8eIQ952JKaBXOoXE04WncoqCy4DMU701LSrPZ3N2Q4zsTawz7GQ+2mrUw== dependencies: "@codemirror/state" "^6.4.0" style-mod "^4.1.0" @@ -1389,17 +1391,17 @@ resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6" integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww== -"@eslint-community/eslint-utils@^4.2.0": +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1": - version "4.10.0" - resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" - integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== +"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1": + version "4.10.1" + resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz#361461e5cb3845d874e61731c11cfedd664d83a0" + integrity sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA== "@eslint/eslintrc@^2.1.4": version "2.1.4" @@ -1422,31 +1424,31 @@ integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== "@floating-ui/core@^1.0.0": - version "1.6.0" - resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz#fa41b87812a16bf123122bf945946bae3fdf7fc1" - integrity sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g== + version "1.6.2" + resolved "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.2.tgz#d37f3e0ac1f1c756c7de45db13303a266226851a" + integrity sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg== dependencies: - "@floating-ui/utils" "^0.2.1" + "@floating-ui/utils" "^0.2.0" -"@floating-ui/dom@^1.0.1", "@floating-ui/dom@^1.6.1": - version "1.6.3" - resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz#954e46c1dd3ad48e49db9ada7218b0985cee75ef" - integrity sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw== +"@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.0.1": + version "1.6.5" + resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz#323f065c003f1d3ecf0ff16d2c2c4d38979f4cb9" + integrity sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw== dependencies: "@floating-ui/core" "^1.0.0" "@floating-ui/utils" "^0.2.0" "@floating-ui/react-dom@^2.0.8": - version "2.0.8" - resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz#afc24f9756d1b433e1fe0d047c24bd4d9cefaa5d" - integrity sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw== + version "2.1.0" + resolved "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.0.tgz#4f0e5e9920137874b2405f7d6c862873baf4beff" + integrity sha512-lNzj5EQmEKn5FFKc04+zasr09h/uX8RtJRNj5gUXsSQIXHVWTVh+hVAg1vOMCexkX8EgvemMvIFpQfkosnVNyA== dependencies: - "@floating-ui/dom" "^1.6.1" + "@floating-ui/dom" "^1.0.0" -"@floating-ui/utils@^0.2.0", "@floating-ui/utils@^0.2.1": - version "0.2.1" - resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2" - integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q== +"@floating-ui/utils@^0.2.0": + version "0.2.2" + resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5" + integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw== "@fortawesome/fontawesome-free@latest": version "6.5.2" @@ -1750,9 +1752,9 @@ "@lezer/common" "^1.0.0" "@lezer/lr@^1.0.0": - version "1.4.0" - resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz#ed52a75dbbfbb0d1eb63710ea84c35ee647cb67e" - integrity sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg== + version "1.4.1" + resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz#fe25f051880a754e820b28148d90aa2a96b8bdd2" + integrity sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw== dependencies: "@lezer/common" "^1.0.0" @@ -1770,27 +1772,27 @@ prop-types "^15.8.1" "@mui/base@^5.0.0-beta.22": - version "5.0.0-beta.42" - resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.42.tgz#d70fb479c57a60ce080d0700fe137db8686abe3e" - integrity sha512-fWRiUJVCHCPF+mxd5drn08bY2qRw3jj5f1SSQdUXmaJ/yKpk23ys8MgLO2KGVTRtbks/+ctRfgffGPbXifj0Ug== + version "5.0.0-dev.20240529-082515-213b5e33ab" + resolved "https://registry.npmjs.org/@mui/base/-/base-5.0.0-dev.20240529-082515-213b5e33ab.tgz#e9a916677dab38ffc92c3171f7d96bf300790531" + integrity sha512-3ic6fc6BHstgM+MGqJEVx3zt9g5THxVXm3VVFUfdeplPqAWWgW2QoKfZDLT10s+pi+MAkpgEBP0kgRidf81Rsw== dependencies: - "@babel/runtime" "^7.24.4" + "@babel/runtime" "^7.24.6" "@floating-ui/react-dom" "^2.0.8" - "@mui/types" "^7.2.14" - "@mui/utils" "^6.0.0-alpha.1" + "@mui/types" "^7.2.14-dev.20240529-082515-213b5e33ab" + "@mui/utils" "^6.0.0-dev.20240529-082515-213b5e33ab" "@popperjs/core" "^2.11.8" - clsx "^2.1.0" + clsx "^2.1.1" prop-types "^15.8.1" -"@mui/core-downloads-tracker@^5.15.15": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.15.tgz#2bc2bda50db66c12f10aefec907c48c8f669ef59" - integrity sha512-aXnw29OWQ6I5A47iuWEI6qSSUfH6G/aCsW9KmW3LiFqr7uXZBK4Ks+z8G+qeIub8k0T5CMqlT2q0L+ZJTMrqpg== +"@mui/core-downloads-tracker@^5.15.19": + version "5.15.19" + resolved "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.19.tgz#7af0025c871f126367a55219486681954e4821d7" + integrity sha512-tCHSi/Tomez9ERynFhZRvFO6n9ATyrPs+2N80DMDzp6xDVirbBjEwhPcE+x7Lj+nwYw0SqFkOxyvMP0irnm55w== "@mui/icons-material@^5.15.10": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.15.tgz#84ce08225a531d9f5dc5132009d91164b456a0ae" - integrity sha512-kkeU/pe+hABcYDH6Uqy8RmIsr2S/y5bP2rp+Gat4CcRjCcVne6KudS1NrZQhUCRysrTDCAhcbcf9gt+/+pGO2g== + version "5.15.19" + resolved "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.19.tgz#0602da80d814af662812659eab891e435ec0d5c0" + integrity sha512-RsEiRxA5azN9b8gI7JRqekkgvxQUlitoBOtZglflb8cUDyP12/cP4gRwhb44Ea1/zwwGGjAj66ZJpGHhKfibNA== dependencies: "@babel/runtime" "^7.23.9" @@ -1808,13 +1810,13 @@ prop-types "^15.8.1" "@mui/material@^5.15.10": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/material/-/material-5.15.15.tgz#e3ba35f50b510aa677cec3261abddc2db7b20b59" - integrity sha512-3zvWayJ+E1kzoIsvwyEvkTUKVKt1AjchFFns+JtluHCuvxgKcLSRJTADw37k0doaRtVAsyh8bz9Afqzv+KYrIA== + version "5.15.19" + resolved "https://registry.npmjs.org/@mui/material/-/material-5.15.19.tgz#a5bd50b6e68cee4ed39ea91dbecede5a020aaa97" + integrity sha512-lp5xQBbcRuxNtjpWU0BWZgIrv2XLUz4RJ0RqFXBdESIsKoGCQZ6P3wwU5ZPuj5TjssNiKv9AlM+vHopRxZhvVQ== dependencies: "@babel/runtime" "^7.23.9" "@mui/base" "5.0.0-beta.40" - "@mui/core-downloads-tracker" "^5.15.15" + "@mui/core-downloads-tracker" "^5.15.19" "@mui/system" "^5.15.15" "@mui/types" "^7.2.14" "@mui/utils" "^5.15.14" @@ -1844,29 +1846,6 @@ csstype "^3.1.3" prop-types "^15.8.1" -"@mui/styles@^5.15.10": - version "5.15.15" - resolved "https://registry.npmjs.org/@mui/styles/-/styles-5.15.15.tgz#cfc974657882cb60c6017d57d81f133d8b5e51a1" - integrity sha512-KBklDHNEddodEjcnZ+/3ieVcp+Mb/pzdQzAagUpt4RDd9m/mn+2JkqJh2rnrWUwS//YLsbL3IbUrONYn5yPxfQ== - dependencies: - "@babel/runtime" "^7.23.9" - "@emotion/hash" "^0.9.1" - "@mui/private-theming" "^5.15.14" - "@mui/types" "^7.2.14" - "@mui/utils" "^5.15.14" - clsx "^2.1.0" - csstype "^3.1.3" - hoist-non-react-statics "^3.3.2" - jss "^10.10.0" - jss-plugin-camel-case "^10.10.0" - jss-plugin-default-unit "^10.10.0" - jss-plugin-global "^10.10.0" - jss-plugin-nested "^10.10.0" - jss-plugin-props-sort "^10.10.0" - jss-plugin-rule-value-function "^10.10.0" - jss-plugin-vendor-prefixer "^10.10.0" - prop-types "^15.8.1" - "@mui/system@^5.15.15": version "5.15.15" resolved "https://registry.npmjs.org/@mui/system/-/system-5.15.15.tgz#658771b200ce3c4a0f28e58169f02e5e718d1c53" @@ -1881,7 +1860,7 @@ csstype "^3.1.3" prop-types "^15.8.1" -"@mui/types@^7.2.14": +"@mui/types@^7.2.14", "@mui/types@^7.2.14-dev.20240529-082515-213b5e33ab": version "7.2.14" resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.14.tgz#8a02ac129b70f3d82f2f9b76ded2c8d48e3fc8c9" integrity sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ== @@ -1896,20 +1875,20 @@ prop-types "^15.8.1" react-is "^18.2.0" -"@mui/utils@^6.0.0-alpha.1": - version "6.0.0-alpha.3" - resolved "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-alpha.3.tgz#c83ad4aed65298cd0128eb47cc00d904f157b62b" - integrity sha512-DBuCy0LmpKFBX6KcZpNve8T3oZmbdZABN0ixJIvDRdoxTG86divvx1CcA71YJojZD3FhRWb0d/XxtMAzn4qIvg== +"@mui/utils@^6.0.0-dev.20240529-082515-213b5e33ab": + version "6.0.0-dev.20240529-082515-213b5e33ab" + resolved "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-dev.20240529-082515-213b5e33ab.tgz#085d02079d9f12baa25f620d314ec2aed4b43ab7" + integrity sha512-jyNcB0drDhYcoq5MHNTiEc63GfVE1GZK+CVUd8tlLzk5q631RPYJ5jONSOszLiUOXBmI8Uu1SBJUwrG3j2YG2A== dependencies: - "@babel/runtime" "^7.24.4" + "@babel/runtime" "^7.24.6" "@types/prop-types" "^15.7.12" prop-types "^15.8.1" react-is "^18.2.0" "@mui/x-date-pickers@^6.19.7": - version "6.19.9" - resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.19.9.tgz#5fb7ecbeec5b5ce1fddbb547583d0083e30a845b" - integrity sha512-B2m4Fv/fOme5qmV6zuE3QnWQSvj3zKtI2OvikPz5prpiCcIxqpeytkQ7VfrWH3/Aqd5yhG1Yr4IgbqG0ymIXGg== + version "6.20.1" + resolved "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.20.1.tgz#b7ce0cfdfbcb0434197edf8385c5d4aaf6a5ac4c" + integrity sha512-DKUzDpHTrP5f6BPclWAs46zrOgDZ+4ewizCO0qbVXMC6rYrZh+ElNeF396GqdZBfrt3ATEyAEa1CW2mceK4wng== dependencies: "@babel/runtime" "^7.23.2" "@mui/base" "^5.0.0-beta.22" @@ -1967,9 +1946,9 @@ semver "^7.3.5" "@npmcli/fs@^3.1.0": - version "3.1.0" - resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e" - integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w== + version "3.1.1" + resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726" + integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg== dependencies: semver "^7.3.5" @@ -2077,12 +2056,12 @@ integrity sha512-7PGLWa9MZ5x/cWy8EH2VzI4T8q5WpuHbixzCDXqixP/WyqwIrg5NDUPgYuFnB4IEIZF+6nA265mYzswFo/h1Pw== "@simonwep/pickr@^1.5.1": - version "1.9.0" - resolved "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.9.0.tgz#1640651ff04e76b48d805dc186c6513087a704a3" - integrity sha512-oEYvv15PyfZzjoAzvXYt3UyNGwzsrpFxLaZKzkOSd0WYBVwLd19iJerePDONxC1iF6+DpcswPdLIM2KzCJuYFg== + version "1.9.1" + resolved "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.9.1.tgz#10d86dab514b8888b2d6b90299a477f254067c43" + integrity sha512-fR3qmfAcPf/HSFS7GEnTmZLM3+xERv1+jyMBbzT63ilRRM8veYjI7ELvkHHKk0/du3lHp7uh/FqatjM3646X1g== dependencies: - core-js "3.32.2" - nanopop "2.3.0" + core-js "3.37.0" + nanopop "2.4.2" "@sinclair/typebox@^0.27.8": version "0.27.8" @@ -2109,9 +2088,9 @@ "@sinonjs/commons" "^3.0.0" "@socket.io/component-emitter@~3.1.0": - version "3.1.1" - resolved "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.1.tgz#621270c02c0a5d4f4669eb1caa9723c91cf201de" - integrity sha512-dzJtaDAAoXx4GCOJpbB2eG/Qj8VDpdwkLsWGzGm+0L7E8/434RyMbAHmk9ubXWVAb9nXmc44jUf8GKqVDiKezg== + version "3.1.2" + resolved "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2" + integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA== "@sphinxxxx/color-conversion@^2.2.2": version "2.2.2" @@ -2233,28 +2212,28 @@ react-transition-state "^1.1.3" "@tanstack/react-table@^8.16.0": - version "8.16.0" - resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.16.0.tgz#92151210ff99d6925353d7a2205735d9c31af48c" - integrity sha512-rKRjnt8ostqN2fercRVOIH/dq7MAmOENCMvVlKx6P9Iokhh6woBGnIZEkqsY/vEJf1jN3TqLOb34xQGLVRuhAg== + version "8.17.3" + resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.17.3.tgz#4e10b4cf5355a40d6d72a83d3f4b3ecd32f56bf4" + integrity sha512-5gwg5SvPD3lNAXPuJJz1fOCEZYk9/GeBFH3w/hCgnfyszOIzwkwgp5I7Q4MJtn0WECp84b5STQUDdmvGi8m3nA== dependencies: - "@tanstack/table-core" "8.16.0" + "@tanstack/table-core" "8.17.3" "@tanstack/react-virtual@^3.4.0": - version "3.4.0" - resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.4.0.tgz#5dcc0ac7c9e35d5db12c3bbe4cbc075bad684d93" - integrity sha512-GZN4xn/Tg5w7gvYeVcMVCeL4pEyUhvg+Cp6KX2Z01C4FRNxIWMgIQ9ibgMarNQfo+gt0PVLcEER4A9sNv/jlow== + version "3.5.1" + resolved "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.5.1.tgz#1ce466f530a10f781871360ed2bf7ff83e664f85" + integrity sha512-jIsuhfgy8GqA67PdWqg73ZB2LFE+HD9hjWL1L6ifEIZVyZVAKpYmgUG4WsKQ005aEyImJmbuimPiEvc57IY0Aw== dependencies: - "@tanstack/virtual-core" "3.4.0" + "@tanstack/virtual-core" "3.5.1" -"@tanstack/table-core@8.16.0": - version "8.16.0" - resolved "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.16.0.tgz#7b58018dd3cec8e0015fe22d6bb24d18d33c891f" - integrity sha512-dCG8vQGk4js5v88/k83tTedWOwjGnIyONrKpHpfmSJB8jwFHl8GSu1sBBxbtACVAPtAQgwNxl0rw1d3RqRM1Tg== +"@tanstack/table-core@8.17.3": + version "8.17.3" + resolved "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.17.3.tgz#d7a9830abb29cd369b52b2a7159dc0360af646fd" + integrity sha512-mPBodDGVL+fl6d90wUREepHa/7lhsghg2A3vFpakEhrhtbIlgNAZiMr7ccTgak5qbHqF14Fwy+W1yFWQt+WmYQ== -"@tanstack/virtual-core@3.4.0": - version "3.4.0" - resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.4.0.tgz#afd72bc5a839b71c2cda87a738eb4eb18451b80a" - integrity sha512-75jXqXxqq5M5Veb9KP1STi8kA5u408uOOAefk2ftHDGCpUk3RP6zX++QqfbmHJTBiU72NQ+ghgCZVts/Wocz8Q== +"@tanstack/virtual-core@3.5.1": + version "3.5.1" + resolved "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.5.1.tgz#f519149bce9156d0e7954b9531df15f446f2fc12" + integrity sha512-046+AUSiDru/V9pajE1du8WayvBKeCvJ2NmKPy/mR8/SbKKrqmSbj7LJBfXE+nSq4f5TBXvnCzu0kcYebI9WdQ== "@testing-library/dom@^8.0.0": version "8.20.1" @@ -2271,9 +2250,9 @@ pretty-format "^27.0.2" "@testing-library/jest-dom@^6.1.2": - version "6.4.2" - resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.2.tgz#38949f6b63722900e2d75ba3c6d9bf8cffb3300e" - integrity sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw== + version "6.4.5" + resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.5.tgz#badb40296477149136dabef32b572ddd3b56adf1" + integrity sha512-AguB9yvTXmCnySBP1lWjfNNUwpbElsaQ567lt2VdGqAdHtpieLgjmcVyv1q7PMIvLbgpDdkWV5Ydv3FEejyp2A== dependencies: "@adobe/css-tools" "^4.3.2" "@babel/runtime" "^7.9.2" @@ -2281,7 +2260,7 @@ chalk "^3.0.0" css.escape "^1.5.1" dom-accessibility-api "^0.6.3" - lodash "^4.17.15" + lodash "^4.17.21" redent "^3.0.0" "@testing-library/react@12": @@ -2345,9 +2324,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.20.5" - resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd" - integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ== + version "7.20.6" + resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7" + integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg== dependencies: "@babel/types" "^7.20.7" @@ -2367,9 +2346,9 @@ "@types/estree" "*" "@types/eslint@*": - version "8.56.9" - resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.9.tgz#403e9ced04a34e63f1c383c5b8ee1a94442c8cc4" - integrity sha512-W4W3KcqzjJ0sHg2vAq9vfml6OhsJ53TcUjUqfzzZf/EChUtwspszj/S0pzMxnfRcO55/iGq47dscXw71Fxc4Zg== + version "8.56.10" + resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" + integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -2422,7 +2401,7 @@ "@types/tough-cookie" "*" parse5 "^7.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -2440,9 +2419,9 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "20.12.7" - resolved "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384" - integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg== + version "20.14.2" + resolved "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18" + integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q== dependencies: undici-types "~5.26.4" @@ -2476,9 +2455,9 @@ "@types/react" "*" "@types/react@*": - version "18.2.79" - resolved "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz#c40efb4f255711f554d47b449f796d1c7756d865" - integrity sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w== + version "18.3.3" + resolved "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" + integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -2531,30 +2510,30 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.59.9": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" - integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== - dependencies: - "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/type-utils" "5.62.0" - "@typescript-eslint/utils" "5.62.0" - debug "^4.3.4" +"@typescript-eslint/eslint-plugin@^7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz#f87a32e8972b8a60024f2f8f12205e7c8108bc41" + integrity sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q== + dependencies: + "@eslint-community/regexpp" "^4.10.0" + "@typescript-eslint/scope-manager" "7.12.0" + "@typescript-eslint/type-utils" "7.12.0" + "@typescript-eslint/utils" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" graphemer "^1.4.0" - ignore "^5.2.0" - natural-compare-lite "^1.4.0" - semver "^7.3.7" - tsutils "^3.21.0" + ignore "^5.3.1" + natural-compare "^1.4.0" + ts-api-utils "^1.3.0" -"@typescript-eslint/parser@^5.57.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" - integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== +"@typescript-eslint/parser@^7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.12.0.tgz#8761df3345528b35049353db80010b385719b1c3" + integrity sha512-dm/J2UDY3oV3TKius2OUZIFHsomQmpHtsV0FTh1WO8EKgHLQ1QCADUqscPgTpU+ih1e21FQSRjXckHn3txn6kQ== dependencies: - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" + "@typescript-eslint/scope-manager" "7.12.0" + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/typescript-estree" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" debug "^4.3.4" "@typescript-eslint/scope-manager@5.62.0": @@ -2565,21 +2544,34 @@ "@typescript-eslint/types" "5.62.0" "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/type-utils@5.62.0": - version "5.62.0" - resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a" - integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew== +"@typescript-eslint/scope-manager@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz#259c014362de72dd34f995efe6bd8dda486adf58" + integrity sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg== dependencies: - "@typescript-eslint/typescript-estree" "5.62.0" - "@typescript-eslint/utils" "5.62.0" + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" + +"@typescript-eslint/type-utils@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz#9dfaaa1972952f395ec5be4f5bbfc4d3cdc63908" + integrity sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA== + dependencies: + "@typescript-eslint/typescript-estree" "7.12.0" + "@typescript-eslint/utils" "7.12.0" debug "^4.3.4" - tsutils "^3.21.0" + ts-api-utils "^1.3.0" "@typescript-eslint/types@5.62.0": version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== +"@typescript-eslint/types@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.12.0.tgz#bf208f971a8da1e7524a5d9ae2b5f15192a37981" + integrity sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg== + "@typescript-eslint/typescript-estree@5.62.0": version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" @@ -2593,7 +2585,31 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.10.0": +"@typescript-eslint/typescript-estree@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.12.0.tgz#e6c1074f248b3db6573ab6a7c47a39c4cd498ff9" + integrity sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ== + dependencies: + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/visitor-keys" "7.12.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "^9.0.4" + semver "^7.6.0" + ts-api-utils "^1.3.0" + +"@typescript-eslint/utils@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.12.0.tgz#c6e58fd7f724cdccc848f71e388ad80cbdb95dd0" + integrity sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@typescript-eslint/scope-manager" "7.12.0" + "@typescript-eslint/types" "7.12.0" + "@typescript-eslint/typescript-estree" "7.12.0" + +"@typescript-eslint/utils@^5.10.0": version "5.62.0" resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== @@ -2615,6 +2631,14 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" +"@typescript-eslint/visitor-keys@7.12.0": + version "7.12.0" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz#c053b55a996679528beeedd8e565710ce1ae1ad3" + integrity sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ== + dependencies: + "@typescript-eslint/types" "7.12.0" + eslint-visitor-keys "^3.4.3" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" @@ -2757,22 +2781,20 @@ "@webassemblyjs/ast" "1.12.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== - dependencies: - envinfo "^7.7.3" +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xmldom/xmldom@^0.7.2": version "0.7.13" @@ -2813,9 +2835,9 @@ abbrev@^2.0.0: integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== ace-builds@^1.31.1: - version "1.33.0" - resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.33.0.tgz#3b6fb993a4b1d3f2b5923aecded098e13e6527d8" - integrity sha512-PDvytkZNvAfuh+PaP5Oy3l3sBGd7xMk4NsB+4w/w1e3gjBqEOGeJwcX+wF/SB6mLtT3VfJLrhDNPT3eaCjtR3w== + version "1.34.2" + resolved "https://registry.npmjs.org/ace-builds/-/ace-builds-1.34.2.tgz#c17c6fd7c661c7ba33f57533a42004a7b3f8dcbd" + integrity sha512-wiOZYuxyOSYfZzDasQTe+ZWmRlYxXSJM/kMKZ/bSqO1VgrBl+PaaTz/Sc+y7hXCKAUj3syUdpwxQyvwv9vQe6w== acorn-globals@^7.0.0: version "7.0.1" @@ -2923,14 +2945,14 @@ ajv-keywords@^5.1.0: uri-js "^4.2.2" "ajv@^8.0.0", "ajv@^8.8.2", "ajv@^8.9.0": - version "8.12.0" - resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + version "8.16.0" + resolved "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4" + integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw== dependencies: - fast-deep-equal "^3.1.1" + fast-deep-equal "^3.1.3" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" - uri-js "^4.2.2" + uri-js "^4.4.1" ansi-escapes@^4.2.1: version "4.3.2" @@ -3048,7 +3070,7 @@ aria-query@^5.0.0: call-bind "^1.0.5" is-array-buffer "^3.0.4" -"array-includes@^3.1.6", "array-includes@^3.1.7": +"array-includes@^3.1.6", "array-includes@^3.1.8": version "3.1.8" resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== @@ -3070,7 +3092,7 @@ array-union@^3.0.1: resolved "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== -array.prototype.findlast@^1.2.4: +array.prototype.findlast@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904" integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ== @@ -3113,14 +3135,14 @@ array.prototype.toreversed@^1.1.2: es-shim-unscopables "^1.0.0" array.prototype.tosorted@^1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz#c8c89348337e51b8a3c48a9227f9ce93ceedcba8" - integrity sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg== + version "1.1.4" + resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc" + integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA== dependencies: - call-bind "^1.0.5" + call-bind "^1.0.7" define-properties "^1.2.1" - es-abstract "^1.22.3" - es-errors "^1.1.0" + es-abstract "^1.23.3" + es-errors "^1.3.0" es-shim-unscopables "^1.0.2" arraybuffer.prototype.slice@^1.0.3: @@ -3232,10 +3254,10 @@ axios-mock-adapter@^1.17.0: fast-deep-equal "^3.1.3" is-buffer "^2.0.5" -axios@^1.6.8: - version "1.6.8" - resolved "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" - integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== +axios@^1.7.2: + version "1.7.2" + resolved "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" + integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -3254,15 +3276,13 @@ babel-jest@^29.7.0: graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^8.1.0: - version "8.3.0" - resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8" - integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q== +babel-loader@^9.1.3: + version "9.1.3" + resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a" + integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw== dependencies: - find-cache-dir "^3.3.1" - loader-utils "^2.0.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" + find-cache-dir "^4.0.0" + schema-utils "^4.0.0" babel-plugin-emotion@^10.0.27: version "10.2.2" @@ -3320,12 +3340,12 @@ babel-plugin-macros@^3.1.0: resolve "^1.19.0" babel-plugin-polyfill-corejs2@^0.4.10: - version "0.4.10" - resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1" - integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ== + version "0.4.11" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" + integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" semver "^6.3.1" "babel-plugin-polyfill-corejs3@^0.10.1", "babel-plugin-polyfill-corejs3@^0.10.4": @@ -3337,11 +3357,11 @@ babel-plugin-polyfill-corejs2@^0.4.10: core-js-compat "^3.36.1" babel-plugin-polyfill-regenerator@^0.6.1: - version "0.6.1" - resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz#4f08ef4c62c7a7f66a35ed4c0d75e30506acc6be" - integrity sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g== + version "0.6.2" + resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" + integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" "babel-plugin-styled-components@>= 1.12.0": version "2.1.4" @@ -3513,12 +3533,12 @@ brace@^0.11.1: resolved "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" integrity sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q== -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== +braces@^3.0.3: + version "3.0.3" + resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" "brorand@^1.0.1", "brorand@^1.1.0": version "1.1.0" @@ -3779,9 +3799,9 @@ cacache@^16.1.0: unique-filename "^2.0.0" cacache@^18.0.0: - version "18.0.2" - resolved "https://registry.npmjs.org/cacache/-/cacache-18.0.2.tgz#fd527ea0f03a603be5c0da5805635f8eef00c60c" - integrity sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw== + version "18.0.3" + resolved "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21" + integrity sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg== dependencies: "@npmcli/fs" "^3.1.0" fs-minipass "^3.0.0" @@ -3866,9 +3886,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" "caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001587", "caniuse-lite@^1.0.30001599": - version "1.0.30001611" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001611.tgz#4dbe78935b65851c2d2df1868af39f709a93a96e" - integrity sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q== + version "1.0.30001629" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz#907a36f4669031bd8a1a8dbc2fa08b29e0db297e" + integrity sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw== "caw@^2.0.0", "caw@^2.0.1": version "2.0.1" @@ -3928,9 +3948,9 @@ chownr@^2.0.0: integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + version "1.0.4" + resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" + integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ== ci-info@^3.2.0: version "3.9.0" @@ -3946,9 +3966,9 @@ ci-info@^3.2.0: safe-buffer "^5.0.1" cjs-module-lexer@^1.0.0: - version "1.2.3" - resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107" - integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ== + version "1.3.1" + resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz#c485341ae8fd999ca4ee5af2d7a1c9ae01e0099c" + integrity sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q== "classnames@*", "classnames@2.x", "classnames@^2.2.1", "classnames@^2.2.5", "classnames@^2.2.6", "classnames@^2.5.1": version "2.5.1" @@ -3997,10 +4017,10 @@ closest@^0.0.1: resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== -"clsx@^2.0.0", "clsx@^2.1.0": - version "2.1.0" - resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz#e851283bcb5c80ee7608db18487433f7b23f77cb" - integrity sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg== +"clsx@^2.0.0", "clsx@^2.1.0", "clsx@^2.1.1": + version "2.1.1" + resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz#eed397c9fd8bd882bfb18deab7102049a2f32999" + integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA== co@^4.6.0: version "4.6.0" @@ -4081,12 +4101,17 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + "commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -"commander@^7.0.0", "commander@^7.2.0": +commander@^7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -4096,10 +4121,10 @@ commander@^9.3.0: resolved "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== +common-path-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" + integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w== concat-map@0.0.1: version "0.0.1" @@ -4182,16 +4207,16 @@ copy-webpack-plugin@^11.0.0: serialize-javascript "^6.0.0" "core-js-compat@^3.31.0", "core-js-compat@^3.36.1": - version "3.37.0" - resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73" - integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA== + version "3.37.1" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee" + integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg== dependencies: browserslist "^4.23.0" -core-js@3.32.2: - version "3.32.2" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7" - integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ== +core-js@3.37.0: + version "3.37.0" + resolved "https://registry.npmjs.org/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb" + integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug== core-util-is@~1.0.0: version "1.0.3" @@ -4428,14 +4453,6 @@ css-tree@~2.2.0: mdn-data "2.0.28" source-map-js "^1.0.1" -css-vendor@^2.0.8: - version "2.0.8" - resolved "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d" - integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ== - dependencies: - "@babel/runtime" "^7.8.3" - is-in-browser "^1.0.2" - "css-what@^6.0.1", "css-what@^6.1.0": version "6.1.0" resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" @@ -4655,9 +4672,9 @@ debounce@^1.2.1: integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== "debug@4", "debug@^4.1.0", "debug@^4.1.1", "debug@^4.3.1", "debug@^4.3.2", "debug@^4.3.3", "debug@^4.3.4", "debug@~4.3.1", "debug@~4.3.2": - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + version "4.3.5" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" + integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== dependencies: ms "2.1.2" @@ -4802,7 +4819,7 @@ deep-is@^0.1.3: es-errors "^1.3.0" gopd "^1.0.1" -"define-properties@^1.1.3", "define-properties@^1.2.0", "define-properties@^1.2.1": +"define-properties@^1.2.0", "define-properties@^1.2.1": version "1.2.1" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== @@ -5092,9 +5109,9 @@ ejs@~3.1.8: jake "^10.8.5" electron-to-chromium@^1.4.668: - version "1.4.740" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.740.tgz#89c82421332ee425e5b193e3db2dea019d423419" - integrity sha512-Yvg5i+iyv7Xm18BRdVPVm8lc7kgxM3r6iwqCH2zB7QZy1kZRNmd0Zqm0zcD9XoFREE5/5rwIuIAOT+/mzGcnZg== + version "1.4.794" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.794.tgz#cca7762998f6c42517770666e272f52a53c08605" + integrity sha512-6FApLtsYhDCY0Vglq3AptsdxQ+PJLc6AxlAM0HjEihUAiOPPbkASEsq9gtxUeZY9o0sJIEa3WnF0vVH4VT4iug== "elliptic@^6.5.3", "elliptic@^6.5.5": version "6.5.5" @@ -5160,9 +5177,9 @@ engine.io-parser@~5.2.1: integrity sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw== enhanced-resolve@^5.16.0: - version "5.16.0" - resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787" - integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA== + version "5.17.0" + resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5" + integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -5183,9 +5200,9 @@ env-paths@^2.2.0: integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== envinfo@^7.7.3: - version "7.12.0" - resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.12.0.tgz#b56723b39c2053d67ea5714f026d05d4f5cc7acd" - integrity sha512-Iw9rQJBGpJRd3rwXm9ft/JiGoAZmLxxJZELYDQoPRZ4USVhkKtIcNBPw6U+/K2mBpaqM25JSV6Yl4Az9vO2wJg== + version "7.13.0" + resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31" + integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q== err-code@^2.0.2: version "2.0.3" @@ -5199,7 +5216,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -"es-abstract@^1.22.1", "es-abstract@^1.22.3", "es-abstract@^1.23.0", "es-abstract@^1.23.1", "es-abstract@^1.23.2": +"es-abstract@^1.22.1", "es-abstract@^1.22.3", "es-abstract@^1.23.0", "es-abstract@^1.23.1", "es-abstract@^1.23.2", "es-abstract@^1.23.3": version "1.23.3" resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== @@ -5258,7 +5275,7 @@ es-define-property@^1.0.0: dependencies: get-intrinsic "^1.2.4" -"es-errors@^1.1.0", "es-errors@^1.2.1", "es-errors@^1.3.0": +"es-errors@^1.2.1", "es-errors@^1.3.0": version "1.3.0" resolved "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== @@ -5278,14 +5295,14 @@ es-get-iterator@^1.1.3: isarray "^2.0.5" stop-iteration-iterator "^1.0.0" -es-iterator-helpers@^1.0.17: - version "1.0.18" - resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz#4d3424f46b24df38d064af6fbbc89274e29ea69d" - integrity sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA== +es-iterator-helpers@^1.0.19: + version "1.0.19" + resolved "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8" + integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw== dependencies: call-bind "^1.0.7" define-properties "^1.2.1" - es-abstract "^1.23.0" + es-abstract "^1.23.3" es-errors "^1.3.0" es-set-tostringtag "^2.0.3" function-bind "^1.1.2" @@ -5299,9 +5316,9 @@ es-iterator-helpers@^1.0.17: safe-array-concat "^1.1.2" es-module-lexer@^1.2.1: - version "1.5.0" - resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236" - integrity sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw== + version "1.5.3" + resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz#25969419de9c0b1fbe54279789023e8a9a788412" + integrity sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg== es-object-atoms@^1.0.0: version "1.0.0" @@ -5335,7 +5352,7 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -escalade@^3.1.1: +"escalade@^3.1.1", "escalade@^3.1.2": version "3.1.2" resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== @@ -5373,33 +5390,33 @@ eslint-plugin-jest@^27.4.0: "@typescript-eslint/utils" "^5.10.0" eslint-plugin-react-hooks@^4.3.0: - version "4.6.0" - resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" - integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== + version "4.6.2" + resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596" + integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== eslint-plugin-react@^7.33.2: - version "7.34.1" - resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz#6806b70c97796f5bbfb235a5d3379ece5f4da997" - integrity sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw== + version "7.34.2" + resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz#2780a1a35a51aca379d86d29b9a72adc6bfe6b66" + integrity sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw== dependencies: - array-includes "^3.1.7" - array.prototype.findlast "^1.2.4" + array-includes "^3.1.8" + array.prototype.findlast "^1.2.5" array.prototype.flatmap "^1.3.2" array.prototype.toreversed "^1.1.2" array.prototype.tosorted "^1.1.3" doctrine "^2.1.0" - es-iterator-helpers "^1.0.17" + es-iterator-helpers "^1.0.19" estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.1.2" - object.entries "^1.1.7" - object.fromentries "^2.0.7" - object.hasown "^1.1.3" - object.values "^1.1.7" + object.entries "^1.1.8" + object.fromentries "^2.0.8" + object.hasown "^1.1.4" + object.values "^1.2.0" prop-types "^15.8.1" resolve "^2.0.0-next.5" semver "^6.3.1" - string.prototype.matchall "^4.0.10" + string.prototype.matchall "^4.0.11" eslint-rule-composer@^0.3.0: version "0.3.0" @@ -5681,11 +5698,6 @@ fast-levenshtein@^2.0.6: resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fast-memoize@^2.5.1: - version "2.5.2" - resolved "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" - integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== - fast-safe-stringify@^2.0.7: version "2.1.1" resolved "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" @@ -5791,21 +5803,20 @@ filenamify@^2.0.0: strip-outer "^1.0.0" trim-repeated "^1.0.0" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== +find-cache-dir@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2" + integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg== dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" + common-path-prefix "^3.0.0" + pkg-dir "^7.0.0" find-root@^1.1.0: version "1.1.0" @@ -5828,6 +5839,14 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" +find-up@^6.3.0: + version "6.3.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" + integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw== + dependencies: + locate-path "^7.1.0" + path-exists "^5.0.0" + find-versions@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e" @@ -6063,15 +6082,15 @@ glob-to-regexp@^0.4.1: integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== "glob@^10.2.2", "glob@^10.3.10": - version "10.3.12" - resolved "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" - integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== + version "10.4.1" + resolved "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2" + integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw== dependencies: foreground-child "^3.1.0" - jackspeak "^2.3.6" - minimatch "^9.0.1" - minipass "^7.0.4" - path-scurry "^1.10.2" + jackspeak "^3.1.2" + minimatch "^9.0.4" + minipass "^7.1.2" + path-scurry "^1.11.1" "glob@^7.1.0", "glob@^7.1.3", "glob@^7.1.4", "glob@^7.1.6": version "7.2.3" @@ -6109,11 +6128,12 @@ globals@^13.19.0: type-fest "^0.20.2" globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + version "1.0.4" + resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" + integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== dependencies: - define-properties "^1.1.3" + define-properties "^1.2.1" + gopd "^1.0.1" globby@^11.1.0: version "11.1.0" @@ -6486,11 +6506,6 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -hyphenate-style-name@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" - integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== - "iconv-lite@0.6.3", "iconv-lite@^0.6.2": version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" @@ -6508,18 +6523,18 @@ hyphenate-style-name@^1.0.3: resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -"ignore@^5.1.9", "ignore@^5.2.0", "ignore@^5.2.4": +"ignore@^5.1.9", "ignore@^5.2.0", "ignore@^5.2.4", "ignore@^5.3.1": version "5.3.1" resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== -image-minimizer-webpack-plugin@^3.8.2: - version "3.8.3" - resolved "https://registry.npmjs.org/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-3.8.3.tgz#41b2379f9d8adabf4e4db63c656543fee26dd4c2" - integrity sha512-Ex0cjNJc2FUSuwN7WHNyxkIZINP0M9lrN+uWJznMcsehiM5Z7ELwk+SEkSGEookK1GUd2wf+09jy1PEH5a5XmQ== +image-minimizer-webpack-plugin@^4.0.2: + version "4.0.2" + resolved "https://registry.npmjs.org/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-4.0.2.tgz#793bee4979ae6753f6e90ed739252d57ee2863f3" + integrity sha512-/A7yc5r/6wQBF/AvVPO8eEroV2XwBFg36+7staL2M88E4VrcjSSjkNJn4dUizw3FAZ/GXO8A7IwWrIGC0f2tCg== dependencies: schema-utils "^4.2.0" - serialize-javascript "^6.0.1" + serialize-javascript "^6.0.2" imagemin-mozjpeg@^10.0.0: version "10.0.0" @@ -6671,10 +6686,10 @@ insert-module-globals@^7.2.1: hasown "^2.0.0" side-channel "^1.0.4" -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== into-stream@^3.1.0: version "3.1.0" @@ -6825,11 +6840,6 @@ is-generator-fn@^2.0.0: dependencies: is-extglob "^2.1.1" -"is-in-browser@^1.0.2", "is-in-browser@^1.1.3": - version "1.1.3" - resolved "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g== - is-jpg@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/is-jpg/-/is-jpg-3.0.0.tgz#f97b4ab6de92401650cb4f54ec0a6ad79c51367f" @@ -7096,18 +7106,18 @@ iterator.prototype@^1.1.2: reflect.getprototypeof "^1.0.4" set-function-name "^2.0.1" -jackspeak@^2.3.6: - version "2.3.6" - resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" - integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== +jackspeak@^3.1.2: + version "3.4.0" + resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a" + integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw== dependencies: "@isaacs/cliui" "^8.0.2" "@pkgjs/parseargs" "^0.11.0" jake@^10.8.5: - version "10.8.7" - resolved "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" - integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== + version "10.9.1" + resolved "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b" + integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w== dependencies: async "^3.2.3" chalk "^4.0.2" @@ -7500,9 +7510,9 @@ jest@^29.6.4: jest-cli "^29.7.0" jiti@^1.20.0: - version "1.21.0" - resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" - integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== + version "1.21.3" + resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.3.tgz#b2adb07489d7629b344d59082bbedb8c21c5f755" + integrity sha512-uy2bNX5zQ+tESe+TiC7ilGRz8AtRGmnJH55NC5S0nSUjvvvM2hJHmefHErugGXN4pNv4Qx7vLsnNw9qJ9mtIsw== jmespath@^0.16.0: version "0.16.0" @@ -7655,76 +7665,6 @@ jsonrepair@3.1.0: resolved "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.1.0.tgz#02488882080930e6a37a7b080bc77546f2e12676" integrity sha512-idqReg23J0PVRAADmZMc5xQM3xeOX5bTB6OTyMnzq33IXJXmn9iJuWIEvGmrN80rQf4d7uLTMEDwpzujNcI0Rg== -jss-plugin-camel-case@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz#27ea159bab67eb4837fa0260204eb7925d4daa1c" - integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw== - dependencies: - "@babel/runtime" "^7.3.1" - hyphenate-style-name "^1.0.3" - jss "10.10.0" - -jss-plugin-default-unit@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz#db3925cf6a07f8e1dd459549d9c8aadff9804293" - integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-global@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz#1c55d3c35821fab67a538a38918292fc9c567efd" - integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-nested@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz#db872ed8925688806e77f1fc87f6e62264513219" - integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - tiny-warning "^1.0.2" - -jss-plugin-props-sort@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz#67f4dd4c70830c126f4ec49b4b37ccddb680a5d7" - integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - -jss-plugin-rule-value-function@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz#7d99e3229e78a3712f78ba50ab342e881d26a24b" - integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g== - dependencies: - "@babel/runtime" "^7.3.1" - jss "10.10.0" - tiny-warning "^1.0.2" - -jss-plugin-vendor-prefixer@^10.10.0: - version "10.10.0" - resolved "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz#c01428ef5a89f2b128ec0af87a314d0c767931c7" - integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg== - dependencies: - "@babel/runtime" "^7.3.1" - css-vendor "^2.0.8" - jss "10.10.0" - -"jss@10.10.0", "jss@^10.10.0": - version "10.10.0" - resolved "https://registry.npmjs.org/jss/-/jss-10.10.0.tgz#a75cc85b0108c7ac8c7b7d296c520a3e4fbc6ccc" - integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw== - dependencies: - "@babel/runtime" "^7.3.1" - csstype "^3.0.2" - is-in-browser "^1.1.3" - tiny-warning "^1.0.2" - "jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.3.5" resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" @@ -7829,9 +7769,9 @@ loader-utils@^2.0.0: json5 "^2.1.2" loader-utils@^3.2.1: - version "3.2.1" - resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576" - integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw== + version "3.3.1" + resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz#735b9a19fd63648ca7adbd31c2327dfe281304e5" + integrity sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg== locate-path@^5.0.0: version "5.0.0" @@ -7847,6 +7787,13 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +locate-path@^7.1.0: + version "7.2.0" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" + integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== + dependencies: + p-locate "^6.0.0" + lodash._basebind@~2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/lodash._basebind/-/lodash._basebind-2.3.0.tgz#2b5bc452a0e106143b21869f233bdb587417d248" @@ -8043,9 +7990,9 @@ lowercase-keys@^1.0.0: integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== "lru-cache@^10.0.1", "lru-cache@^10.2.0": - version "10.2.0" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" - integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + version "10.2.2" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" + integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== lru-cache@^4.0.1: version "4.1.5" @@ -8086,13 +8033,6 @@ lz-string@^1.5.0: dependencies: pify "^3.0.0" -"make-dir@^3.0.2", "make-dir@^3.1.0": - version "3.1.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - make-dir@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e" @@ -8123,9 +8063,9 @@ make-fetch-happen@^10.0.3: ssri "^9.0.0" make-fetch-happen@^13.0.0: - version "13.0.0" - resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.0.tgz#705d6f6cbd7faecb8eac2432f551e49475bfedf0" - integrity sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A== + version "13.0.1" + resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" + integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA== dependencies: "@npmcli/agent" "^2.0.0" cacache "^18.0.0" @@ -8136,6 +8076,7 @@ make-fetch-happen@^13.0.0: minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" negotiator "^0.6.3" + proc-log "^4.2.0" promise-retry "^2.0.1" ssri "^10.0.0" @@ -8234,11 +8175,11 @@ microbuffer@^1.0.0: integrity sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA== micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + version "4.0.7" + resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" + integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== dependencies: - braces "^3.0.2" + braces "^3.0.3" picomatch "^2.3.1" miller-rabin@^4.0.0: @@ -8313,7 +8254,7 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.1: +minimatch@^9.0.4: version "9.0.4" resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== @@ -8359,9 +8300,9 @@ minipass-fetch@^2.0.3: minizlib "^2.1.2" minipass-fetch@^3.0.0: - version "3.0.4" - resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7" - integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg== + version "3.0.5" + resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c" + integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg== dependencies: encoding "^0.1.13" minipass "^7.0.3" @@ -8401,10 +8342,10 @@ minipass@^5.0.0: resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", "minipass@^7.0.2", "minipass@^7.0.3", "minipass@^7.0.4": - version "7.0.4" - resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" - integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", "minipass@^7.0.2", "minipass@^7.0.3", "minipass@^7.1.2": + version "7.1.2" + resolved "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" + integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== "minizlib@^2.1.1", "minizlib@^2.1.2": version "2.1.2" @@ -8533,15 +8474,10 @@ nan@^2.14.2: resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== -nanopop@2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/nanopop/-/nanopop-2.3.0.tgz#a5f672fba27d45d6ecbd0b59789c040072915123" - integrity sha512-fzN+T2K7/Ah25XU02MJkPZ5q4Tj5FpjmIYq4rvoHX4yb16HzFdCO6JxFFn5Y/oBhQ8no8fUZavnyIv9/+xkBBw== - -natural-compare-lite@^1.4.0: - version "1.4.0" - resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" - integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== +nanopop@2.4.2: + version "2.4.2" + resolved "https://registry.npmjs.org/nanopop/-/nanopop-2.4.2.tgz#b55482135be7e64f2d0f5aa8ef51a58104ac7b13" + integrity sha512-NzOgmMQ+elxxHeIha+OG/Pv3Oc3p4RU2aBhwWwAqDpXrdTbtRylbRLQztLy8dMMwfl6pclznBdfUhccEn9ZIzw== natural-compare@^1.4.0: version "1.4.0" @@ -8639,9 +8575,9 @@ nopt@^6.0.0: abbrev "^1.0.0" nopt@^7.0.0: - version "7.2.0" - resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7" - integrity sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA== + version "7.2.1" + resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" + integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== dependencies: abbrev "^2.0.0" @@ -8739,9 +8675,9 @@ nth-check@^2.0.1: boolbase "^1.0.0" nwsapi@^2.2.2: - version "2.2.7" - resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" - integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + version "2.2.10" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz#0b77a68e21a0b483db70b11fad055906e867cda8" + integrity sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ== "object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1": version "4.1.1" @@ -8776,7 +8712,7 @@ object-keys@^1.1.1: has-symbols "^1.0.3" object-keys "^1.1.1" -object.entries@^1.1.7: +object.entries@^1.1.8: version "1.1.8" resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41" integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ== @@ -8785,7 +8721,7 @@ object.entries@^1.1.7: define-properties "^1.2.1" es-object-atoms "^1.0.0" -object.fromentries@^2.0.7: +object.fromentries@^2.0.8: version "2.0.8" resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65" integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ== @@ -8795,7 +8731,7 @@ object.fromentries@^2.0.7: es-abstract "^1.23.2" es-object-atoms "^1.0.0" -object.hasown@^1.1.3: +object.hasown@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc" integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg== @@ -8804,7 +8740,7 @@ object.hasown@^1.1.3: es-abstract "^1.23.2" es-object-atoms "^1.0.0" -"object.values@^1.1.6", "object.values@^1.1.7": +"object.values@^1.1.6", "object.values@^1.2.0": version "1.2.0" resolved "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== @@ -8840,16 +8776,16 @@ opener@^1.5.2: integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== optionator@^0.9.3: - version "0.9.3" - resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" - integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== + version "0.9.4" + resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" + integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g== dependencies: - "@aashutoshrathi/word-wrap" "^1.2.3" deep-is "^0.1.3" fast-levenshtein "^2.0.6" levn "^0.4.1" prelude-ls "^1.2.1" type-check "^0.4.0" + word-wrap "^1.2.5" optipng-bin@^7.0.0: version "7.0.1" @@ -8919,6 +8855,13 @@ p-limit@^2.2.0: dependencies: yocto-queue "^0.1.0" +p-limit@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" + integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== + dependencies: + yocto-queue "^1.0.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -8933,6 +8876,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-locate@^6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" + integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== + dependencies: + p-limit "^4.0.0" + p-map-series@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca" @@ -9042,6 +8992,11 @@ path-exists@^4.0.0: resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +path-exists@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" + integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== + "path-fx@^2.0.0", "path-fx@^2.1.1": version "2.1.2" resolved "https://registry.npmjs.org/path-fx/-/path-fx-2.1.2.tgz#10683d3e7c4f0aa4fa974fb6e5f1302c181eee00" @@ -9079,10 +9034,10 @@ path-platform@~0.11.15: resolved "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" integrity sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg== -path-scurry@^1.10.2: - version "1.10.2" - resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" - integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== +path-scurry@^1.11.1: + version "1.11.1" + resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" + integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== dependencies: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -9130,10 +9085,10 @@ performance-now@^2.1.0: resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +"picocolors@^1.0.0", "picocolors@^1.0.1": + version "1.0.1" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" + integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== "picomatch@^2.0.4", "picomatch@^2.2.3", "picomatch@^2.3.1": version "2.3.1" @@ -9177,13 +9132,20 @@ pirates@^4.0.4: resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== -"pkg-dir@^4.1.0", "pkg-dir@^4.2.0": +pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== dependencies: find-up "^4.0.0" +pkg-dir@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11" + integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA== + dependencies: + find-up "^6.3.0" + possible-typed-array-names@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" @@ -9590,9 +9552,9 @@ postcss-reduce-transforms@^6.0.2: postcss-value-parser "^4.2.0" "postcss-selector-parser@^6.0.11", "postcss-selector-parser@^6.0.16", "postcss-selector-parser@^6.0.2", "postcss-selector-parser@^6.0.4", "postcss-selector-parser@^6.0.5", "postcss-selector-parser@^6.0.9": - version "6.0.16" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04" - integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw== + version "6.1.0" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53" + integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -9684,6 +9646,11 @@ proc-log@^3.0.0: resolved "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8" integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A== +proc-log@^4.2.0: + version "4.2.0" + resolved "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" + integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -9867,9 +9834,9 @@ rc-align@^4.0.0: resize-observer-polyfill "^1.5.1" rc-dock@^3.2.9: - version "3.2.19" - resolved "https://registry.npmjs.org/rc-dock/-/rc-dock-3.2.19.tgz#246e76f0ffec69a2aa40c7c4ad0c4ef3a5edbf00" - integrity sha512-onjYMYw4IEzf5LbQyQt+a2mSJ58oxAgpu29CD8/rexR5IWjTsa3amxyF+CxHy2+wtqCDzi/qsDsJglH/k6Bx9g== + version "3.3.0" + resolved "https://registry.npmjs.org/rc-dock/-/rc-dock-3.3.0.tgz#cb895359b58118bc9ace94329731a5d35e3b4005" + integrity sha512-9rQAzHSLAdQz1ZpPqQGkZKlAt4YI6gNYjuqqpY6hIWBFDhVPccs0jYr7L7PP3OpmliZ/R60LgHfLFbrL9l+Tlg== dependencies: classnames "^2.5.1" lodash "^4.17.21" @@ -9914,13 +9881,13 @@ rc-menu@~9.8.4: rc-util "^5.27.0" "rc-motion@^2.0.0", "rc-motion@^2.4.3": - version "2.9.0" - resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.0.tgz#9e18a1b8d61e528a97369cf9a7601e9b29205710" - integrity sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ== + version "2.9.1" + resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.1.tgz#5b405437f9f673ed1a59b6b797c2227c2d6b3d91" + integrity sha512-QD4bUqByjVQs7PhUT1d4bNxvtTcK9ETwtg7psbDfo6TmYalH/1hhjj4r2hbhW7g5OOEqYHhfwfj4noIvuOVRtQ== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" - rc-util "^5.21.0" + rc-util "^5.39.3" rc-new-window@^0.1.13: version "0.1.13" @@ -9975,20 +9942,18 @@ rc-tabs@~11.16.1: rc-motion "^2.0.0" rc-util "^5.19.2" -"rc-util@^5.12.0", "rc-util@^5.17.0", "rc-util@^5.19.2", "rc-util@^5.21.0", "rc-util@^5.26.0", "rc-util@^5.27.0", "rc-util@^5.37.0", "rc-util@^5.38.0", "rc-util@^5.5.0": - version "5.39.1" - resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.39.1.tgz#7bca4fb55e20add0eef5c23166cd9f9e5f51a8a1" - integrity sha512-OW/ERynNDgNr4y0oiFmtes3rbEamXw7GHGbkbNd9iRr7kgT03T6fT0b9WpJ3mbxKhyOcAHnGcIoh5u/cjrC2OQ== +"rc-util@^5.12.0", "rc-util@^5.17.0", "rc-util@^5.19.2", "rc-util@^5.26.0", "rc-util@^5.27.0", "rc-util@^5.37.0", "rc-util@^5.38.0", "rc-util@^5.39.3", "rc-util@^5.5.0": + version "5.41.0" + resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.41.0.tgz#b1ba000d4f3a9e72563370a3243b59f89b40e1bd" + integrity sha512-xtlCim9RpmVv0Ar2Nnc3WfJCxjQkTf3xHPWoFdjp1fSs2NirQwqiQrfqdU9HUe0kdfb168M/T8Dq0IaX50xeKg== dependencies: "@babel/runtime" "^7.18.3" react-is "^18.2.0" -re-resizable@6.9.6: - version "6.9.6" - resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.6.tgz#b95d37e3821481b56ddfb1e12862940a791e827d" - integrity sha512-0xYKS5+Z0zk+vICQlcZW+g54CcJTTmHluA7JUUgvERDxnKAnytylcyPsA+BSFi759s5hPlHmBRegFrwXs2FuBQ== - dependencies: - fast-memoize "^2.5.1" +re-resizable@6.9.17: + version "6.9.17" + resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.17.tgz#78e4349934ff24a8fcb4b6b5a43ff9ed5f319d2a" + integrity sha512-OBqd1BwVXpEJJn/yYROG+CbeqIDBWIp6wathlpB0kzZWWZIY1gPTsgK2yJEui5hOvkCdC2mcexF2V3DZVfLq2g== react-arborist@^3.2.0: version "3.4.0" @@ -10067,15 +10032,7 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" -react-draggable@4.4.5: - version "4.4.5" - resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c" - integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g== - dependencies: - clsx "^1.1.1" - prop-types "^15.8.1" - -react-draggable@^4.4.6: +"react-draggable@4.4.6", "react-draggable@^4.4.6": version "4.4.6" resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e" integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw== @@ -10093,9 +10050,9 @@ react-dropzone@^14.2.1: prop-types "^15.8.1" react-frame-component@^5.2.6: - version "5.2.6" - resolved "https://registry.npmjs.org/react-frame-component/-/react-frame-component-5.2.6.tgz#0d9991d251ff1f7177479d8f370deea06b824b79" - integrity sha512-CwkEM5VSt6nFwZ1Op8hi3JB5rPseZlmnp5CGiismVTauE6S4Jsc4TNMlT0O7Cts4WgIC3ZBAQ2p1Mm9XgLbj+w== + version "5.2.7" + resolved "https://registry.npmjs.org/react-frame-component/-/react-frame-component-5.2.7.tgz#e31c0943be95fdf667c59d6d7fcf18c1dda4d4b2" + integrity sha512-ROjHtSLoSVYUBfTieazj/nL8jIX9rZFmHC0yXEU+dx6Y82OcBEGgU9o7VyHMrBFUN9FuQ849MtIPNNLsb4krbg== "react-is@^16.13.1", "react-is@^16.7.0": version "16.13.1" @@ -10108,9 +10065,9 @@ react-is@^17.0.1: integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== "react-is@^18.0.0", "react-is@^18.2.0": - version "18.2.0" - resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + version "18.3.1" + resolved "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== react-leaflet@^3.2.2: version "3.2.5" @@ -10139,13 +10096,13 @@ react-resize-detector@^9.1.0: lodash "^4.17.21" react-rnd@^10.3.5: - version "10.4.1" - resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.1.tgz#9e1c3f244895d7862ef03be98b2a620848c3fba1" - integrity sha512-0m887AjQZr6p2ADLNnipquqsDq4XJu/uqVqI3zuoGD19tRm6uB83HmZWydtkilNp5EWsOHbLGF4IjWMdd5du8Q== + version "10.4.11" + resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.11.tgz#d1c3086de4ab163e01b49f8feae5a14b3d58e3f7" + integrity sha512-XTfNGNcS0ad2vo3to7qNTB0BkFML9k1csIUI0Nlj44M6Uuh7yP/2h8WXiXcV3v3bxxVJck1C9K6FS1LrLH0E0Q== dependencies: - re-resizable "6.9.6" - react-draggable "4.4.5" - tslib "2.3.1" + re-resizable "6.9.17" + react-draggable "4.4.6" + tslib "2.6.2" react-select@^5.7.2: version "5.8.0" @@ -10268,12 +10225,12 @@ readable-web-to-node-stream@^3.0.0: dependencies: readable-stream "^3.6.0" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== dependencies: - resolve "^1.9.0" + resolve "^1.20.0" redent@^3.0.0: version "3.0.0" @@ -10416,7 +10373,7 @@ resolve.exports@^2.0.0: resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -"resolve@^1.1.4", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.17.0", "resolve@^1.19.0", "resolve@^1.20.0", "resolve@^1.4.0", "resolve@^1.9.0": +"resolve@^1.1.4", "resolve@^1.12.0", "resolve@^1.14.2", "resolve@^1.17.0", "resolve@^1.19.0", "resolve@^1.20.0", "resolve@^1.4.0": version "1.22.8" resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -10520,9 +10477,9 @@ safe-regex-test@^1.0.3: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sax@^1.2.4: - version "1.3.0" - resolved "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" - integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== + version "1.4.1" + resolved "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" + integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== saxes@^6.0.0: version "6.0.0" @@ -10539,15 +10496,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - "schema-utils@^3.0.0", "schema-utils@^3.1.1", "schema-utils@^3.2.0": version "3.3.0" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" @@ -10591,19 +10539,17 @@ semver-truncate@^1.1.2: resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -"semver@^6.0.0", "semver@^6.3.0", "semver@^6.3.1": +"semver@^6.3.0", "semver@^6.3.1": version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -"semver@^7.3.4", "semver@^7.3.5", "semver@^7.3.7", "semver@^7.5.3", "semver@^7.5.4": - version "7.6.0" - resolved "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" - integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== - dependencies: - lru-cache "^6.0.0" +"semver@^7.3.4", "semver@^7.3.5", "semver@^7.3.7", "semver@^7.5.3", "semver@^7.5.4", "semver@^7.6.0": + version "7.6.2" + resolved "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" + integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== -"serialize-javascript@^6.0.0", "serialize-javascript@^6.0.1": +"serialize-javascript@^6.0.0", "serialize-javascript@^6.0.1", "serialize-javascript@^6.0.2": version "6.0.2" resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== @@ -10902,9 +10848,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.17" - resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c" - integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg== + version "3.0.18" + resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326" + integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ== split.js@^1.5.10: version "1.6.5" @@ -10927,18 +10873,18 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sql-formatter@^15.1.2: - version "15.3.0" - resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.0.tgz#d6daec93b5d3fd053f40295a306f5440cc578849" - integrity sha512-1aDYVEX+dwOSCkRYns4HEGupRZoaivcsNpU4IzR+MVC+cWFYK9/dce7pr4aId4+ED2iK9PNs3j1Vdf8C+SIvDg== + version "15.3.1" + resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.1.tgz#e988861d172827b856470a9baefa0135737227df" + integrity sha512-L/dqan+Hrt0PpPdCbHcI9bdfOvqaQZR7v5c5SWMJ3bUGQSezK09Mm9q2I3B4iObjaq7FyoldIM+fDSmfzGRXCA== dependencies: argparse "^2.0.1" get-stdin "=8.0.0" nearley "^2.20.1" ssri@^10.0.0: - version "10.0.5" - resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c" - integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A== + version "10.0.6" + resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" + integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ== dependencies: minipass "^7.0.3" @@ -11033,7 +10979,7 @@ string-length@^4.0.1: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.matchall@^4.0.10: +string.prototype.matchall@^4.0.11: version "4.0.11" resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a" integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg== @@ -11240,9 +11186,9 @@ stylis@4.2.0: integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== stylis@^4.0.7: - version "4.3.1" - resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.1.tgz#ed8a9ebf9f76fe1e12d462f5cc3c4c980b23a7eb" - integrity sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ== + version "4.3.2" + resolved "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444" + integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== subarg@^1.0.0: version "1.0.0" @@ -11334,9 +11280,9 @@ svgo@^2.7.0: stable "^0.1.8" "svgo@^3.0.2", "svgo@^3.2.0": - version "3.2.0" - resolved "https://registry.npmjs.org/svgo/-/svgo-3.2.0.tgz#7a5dff2938d8c6096e00295c2390e8e652fa805d" - integrity sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ== + version "3.3.2" + resolved "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8" + integrity sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" @@ -11418,9 +11364,9 @@ tempfile@^2.0.0: terser "^5.26.0" terser@^5.26.0: - version "5.30.3" - resolved "https://registry.npmjs.org/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2" - integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA== + version "5.31.1" + resolved "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz#735de3c987dd671e95190e6b98cfe2f07f3cf0d4" + integrity sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -11466,11 +11412,6 @@ timers-browserify@^1.0.1: dependencies: process "~0.11.0" -tiny-warning@^1.0.2: - version "1.0.3" - resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" - integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== - tmpl@1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -11507,9 +11448,9 @@ totalist@^3.0.0: integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ== tough-cookie@^4.1.2: - version "4.1.3" - resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" - integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + version "4.1.4" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36" + integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag== dependencies: psl "^1.1.33" punycode "^2.1.1" @@ -11535,10 +11476,15 @@ trim-repeated@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -tslib@2.3.1: - version "2.3.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +ts-api-utils@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" + integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== + +tslib@2.6.2: + version "2.6.2" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== tslib@^1.8.1: version "1.14.1" @@ -11546,9 +11492,9 @@ tslib@^1.8.1: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== "tslib@^2.0.3", "tslib@^2.4.0": - version "2.6.2" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + version "2.6.3" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" + integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== tsutils@^3.21.0: version "3.21.0" @@ -11670,10 +11616,10 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^4.9.5: - version "4.9.5" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.4.5: + version "5.4.5" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" + integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== uglify-js@^3.1.4: version "3.17.4" @@ -11786,12 +11732,12 @@ universalify@^0.2.0: integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== + version "1.0.16" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356" + integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ== dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" + escalade "^3.1.2" + picocolors "^1.0.1" uplot-react@^1.1.4: version "1.1.5" @@ -11803,7 +11749,7 @@ uplot@^1.6.24: resolved "https://registry.npmjs.org/uplot/-/uplot-1.6.30.tgz#1622a96b7cb2e50622c74330823c321847cbc147" integrity sha512-48oVVRALM/128ttW19F2a2xobc2WfGdJ0VJFX00099CfqbCTuML7L2OrTKxNzeFP34eo1+yJbqFSoFAp2u28/Q== -uri-js@^4.2.2: +"uri-js@^4.2.2", "uri-js@^4.4.1": version "4.4.1" resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== @@ -11864,11 +11810,16 @@ use-isomorphic-layout-effect@^1.1.2: resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -"use-sync-external-store@1.2.0", "use-sync-external-store@^1.2.0": +use-sync-external-store@1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== +use-sync-external-store@^1.2.0: + version "1.2.2" + resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9" + integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== + "util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1": version "1.0.2" resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -11999,22 +11950,23 @@ webpack-bundle-analyzer@^4.8.0: sirv "^2.0.3" ws "^7.3.1" -webpack-cli@^4.5.0: - version "4.10.0" - resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== +webpack-cli@^5.1.4: + version "5.1.4" + resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" - commander "^7.0.0" + commander "^10.0.1" cross-spawn "^7.0.3" + envinfo "^7.7.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" + interpret "^3.1.1" + rechoir "^0.8.0" webpack-merge "^5.7.3" webpack-merge@^5.7.3: @@ -12179,6 +12131,11 @@ wkx@^0.5.0: dependencies: "@types/node" "*" +word-wrap@^1.2.5: + version "1.2.5" + resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" @@ -12221,9 +12178,9 @@ ws@^7.3.1: integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== ws@^8.11.0: - version "8.16.0" - resolved "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + version "8.17.0" + resolved "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" + integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== ws@~8.11.0: version "8.11.0" @@ -12340,6 +12297,11 @@ yocto-queue@^0.1.0: resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +yocto-queue@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" + integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== + zustand@^4.4.1: version "4.5.2" resolved "https://registry.npmjs.org/zustand/-/zustand-4.5.2.tgz#fddbe7cac1e71d45413b3682cdb47b48034c3848" diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 01b2cc14a9132..9697a25c066c4 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.94.16"; + version = "0.94.17"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-oWKE7k/ryEDdz63xeauDGK9y0nz6pri/sOnFTk0qBdM="; + hash = "sha256-d3ZHnQtQoDnUgNvPpKhV1Wg6pIIM0rQ/kfb4VbBGSsU="; }; - vendorHash = "sha256-qrDadHGhjwsAIfIQIkUeT7Tehv1sTtsfzgPyKxc5zJE="; + vendorHash = "sha256-maeoEs6He4Qb4EOYCx44Ly8713NFn/5qWgNjb1s2ajw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index ba65217d59c70..3b9ffe581afd6 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.31.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-v8KkF5GShMDVjeAoe/bvoqHIBKDJ1hd6RIpu9Zugc6w="; + sha256 = "sha256-+zSUgwh3CKyvBzRY4NevkoSINfvMNOfw8rvs48O0yJw="; }; - vendorHash = "sha256-Oprca0JX8SmrEGrnalzKt89qrXa5UEbErl8BOFJlHGI="; + vendorHash = "sha256-iEPBTM+hVAGs0TF30onHR0lWAALQbsA164OTkYuOdwc="; ldflags = [ "-w" diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 26ac2c3938a11..1de32cefab141 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.52.2"; + version = "0.53.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-3RUL0sgO2/hcfuihNKr51t0qbXvxs9X7yD/OBGATDdw="; + hash = "sha256-DzCPJU99cLDnVGsFImy2lQX2WBXXMaiF3dM8P/ZIdvA="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-VkUyjmiiJsDx7NdU6T20LB3tltOYYtf/RaTTPuliMQU="; + vendorHash = "sha256-QRdXhISiTVFWn54qYT+0hXMr2RYkRAV29HFv3zUPeHE="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index c24176263dfec..2cb28910982d3 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "7zz"; - version = "24.06"; + version = "24.07"; src = fetchurl { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; hash = { - free = "sha256-X3uqGnJGQpW5MOaTtgWYwwrhS84e+piX7Gc+e8Pll00="; - unfree = "sha256-KqFmDHc1JbLthNbNf/BoDHhuwIk7h+TbRGVNy39ayLU="; + free = "sha256-qVX4CViXsODmPZIPdHzG3xgCVDVb0qZ+1l3+I9wJg2o="; + unfree = "sha256-0bCHSj8cJt8hx2GkowaR3BIT6Fd/GO54MmwUyk1oPis="; }.${if enableUnfree then "unfree" else "free"}; downloadToTemp = (!enableUnfree); # remove the unRAR related code from the src drv diff --git a/pkgs/tools/archivers/peazip/default.nix b/pkgs/tools/archivers/peazip/default.nix index 4070c58d46c2e..2c81ec5fdd599 100644 --- a/pkgs/tools/archivers/peazip/default.nix +++ b/pkgs/tools/archivers/peazip/default.nix @@ -6,6 +6,7 @@ , lazarus , xorg , libqt5pas +, runCommand , _7zz , archiver , brotli @@ -16,16 +17,21 @@ stdenv.mkDerivation rec { pname = "peazip"; - version = "9.6.0"; + version = "9.7.1"; src = fetchFromGitHub { owner = "peazip"; repo = pname; rev = version; - hash = "sha256-75EkVRx6bX1ZZzeNSR7IvKNjTA5NvzFzUJdORiAVHBo="; + hash = "sha256-HxRpoT+O9nWL4FzB6CjJ0DqnZALaaYtXGb82GkgF2JA="; }; sourceRoot = "${src.name}/peazip-sources"; + postPatch = '' + # set it to use compression programs from $PATH + substituteInPlace dev/peach.pas --replace " HSYSBIN = 0;" " HSYSBIN = 2;" + ''; + nativeBuildInputs = [ wrapQtAppsHook lazarus @@ -40,43 +46,48 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' + # lazarus tries to create files in $HOME/.lazarus export HOME=$(mktemp -d) - cd dev - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi && [ -f pea ] - lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi && [ -f peazip ] - cd .. + pushd dev + lazbuild --lazarusdir=${lazarus}/share/lazarus --add-package metadarkstyle/metadarkstyle.lpk + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi + lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi + popd + ''; + + # peazip looks for the "7z", not "7zz" + _7z = runCommand "7z" {} '' + mkdir -p $out/bin + ln -s ${_7zz}/bin/7zz $out/bin/7z ''; installPhase = '' runHook preInstall - # Executables - ## Main programs install -D dev/{pea,peazip} -t $out/lib/peazip + wrapProgram $out/lib/peazip/peazip --prefix PATH : ${lib.makeBinPath [ + _7z + archiver + brotli + upx + zpaq + zstd + ]} mkdir -p $out/bin ln -s $out/lib/peazip/{pea,peazip} $out/bin/ - ## Symlink the available compression algorithm programs. - mkdir -p $out/lib/peazip/res/bin/7z - ln -s ${_7zz}/bin/7zz $out/lib/peazip/res/bin/7z/7z - mkdir -p $out/lib/peazip/res/bin/arc - ln -s ${archiver}/bin/arc $out/lib/peazip/res/bin/arc/ - mkdir -p $out/lib/peazip/res/bin/brotli - ln -s ${brotli}/bin/brotli $out/lib/peazip/res/bin/brotli/ - mkdir -p $out/lib/peazip/res/bin/upx - ln -s ${upx}/bin/upx $out/lib/peazip/res/bin/upx/ - mkdir -p $out/lib/peazip/res/bin/zpaq - ln -s ${zpaq}/bin/zpaq $out/lib/peazip/res/bin/zpaq/ - mkdir -p $out/lib/peazip/res/bin/zstd - ln -s ${zstd}/bin/zstd $out/lib/peazip/res/bin/zstd/ - - mkdir -p $out/share/peazip + mkdir -p $out/share/peazip $out/lib/peazip/res/share ln -s $out/share/peazip $out/lib/peazip/res/share cp -r res/share/{icons,lang,themes,presets} $out/share/peazip/ - install -D res/share/batch/freedesktop_integration/peazip.png -t "$out/share/icons/hicolor/256x256/apps" - install -D res/share/icons/peazip_{7z,rar,zip}.png -t "$out/share/icons/hicolor/256x256/mimetypes" - install -D res/share/batch/freedesktop_integration/peazip_{add,extract}.png -t "$out/share/icons/hicolor/256x256/actions" - install -D res/share/batch/freedesktop_integration/*.desktop -t "$out/share/applications" + # Install desktop entries + install -D res/share/batch/freedesktop_integration/*.desktop -t $out/share/applications + # Install desktop entries's icons + mkdir -p $out/share/icons/hicolor/256x256/apps + ln -s $out/share/peazip/icons/peazip.png -t $out/share/icons/hicolor/256x256/apps/ + mkdir $out/share/icons/hicolor/256x256/mimetypes + ln -s $out/share/peazip/icons/peazip_{7z,zip,cd}.png $out/share/icons/hicolor/256x256/mimetypes/ + mkdir $out/share/icons/hicolor/256x256/actions + ln -s $out/share/peazip/icons/peazip_{add,extract,convert}.png $out/share/icons/hicolor/256x256/actions/ runHook postInstall ''; @@ -94,5 +105,6 @@ stdenv.mkDerivation rec { homepage = "https://peazip.github.io"; platforms = platforms.linux; maintainers = with maintainers; [ annaaurora ]; + mainProgram = "peazip"; }; } diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 2c9143d51f895..c1b7eab31f9a9 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "darkice"; - version = "1.4"; + version = "1.5"; src = fetchurl { url = "https://github.com/rafael2k/darkice/releases/download/v${version}/darkice-${version}.tar.gz"; - sha256 = "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76"; + sha256 = "sha256-GLTEVzp8z+CcEJTrV5gVniqYkhBupi11OTP28qdGBY4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index aad2647d2e3ec..9f7237dd497b0 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook3 }: +{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchFromGitHub, gtk3, adwaita-icon-theme, gdk-pixbuf, librsvg, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "gvolicon"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme + alsa-lib gtk3 gdk-pixbuf adwaita-icon-theme librsvg wrapGAppsHook3 ]; diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index bb09b9b183024..d4ee520ad6dc0 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mpd-notification"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "eworm-de"; repo = "mpd-notification"; rev = version; - hash = "sha256-1DG8pemlF5bURbdJwGTZqp3WVfLOwGEpfqq9q1NtwaE="; + hash = "sha256-8iBG1IdbERB2gOALvVBNJ3/hhiou3D/azSRkRD+u9O8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index 218872ed1e313..c74919dbcb0ed 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -57,21 +57,14 @@ effectiveStdenv.mkDerivation (finalAttrs: { CoreVideo MetalKit ] ++ lib.optionals cudaSupport ( with cudaPackages; [ - - # A temporary hack for reducing the closure size, remove once cudaPackages - # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 - cuda_cccl.dev # provides nv/target - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - libcublas.dev - libcublas.lib - libcublas.static + cuda_cccl # provides nv/target + cuda_cudart + libcublas ]); postPatch = let cudaOldStr = "-lcuda "; - cudaNewStr = "-lcuda -L${cudaPackages.cuda_cudart.lib}/lib/stubs "; + cudaNewStr = "-lcuda -L${cudaPackages.cuda_cudart}/lib/stubs "; in lib.optionalString cudaSupport '' substituteInPlace Makefile \ --replace '${cudaOldStr}' '${cudaNewStr}' diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index c89e1a208153a..c0ceb449707df 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook3 -, gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio +, adwaita-icon-theme, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio , gsettings-desktop-schemas }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ]; buildInputs = [ - gnome.adwaita-icon-theme + adwaita-icon-theme avahi gtk3 libayatana-appindicator libnotify libpulseaudio gsettings-desktop-schemas ]; diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 3e252f2313b4b..68235ab3d469e 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -22,6 +22,9 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; + # Remove when https://github.com/spotDL/spotify-downloader/issues/2119 is fixed + patches = [ ./is_lrc_valid-failure.patch ]; + dependencies = with python3.pkgs; [ bandcamp-api beautifulsoup4 diff --git a/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch b/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch new file mode 100644 index 0000000000000..e419bca125d2a --- /dev/null +++ b/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch @@ -0,0 +1,65 @@ +From 0c1357470450d98b3b7fe5444ac460ba9ee04425 Mon Sep 17 00:00:00 2001 +From: Jeremy Cutler <jerz4lunch@users.noreply.github.com> +Date: Mon, 17 Jun 2024 02:19:33 -0700 +Subject: [PATCH 1/2] Update lrc.py for updated function in python-syncedlyrics + +See syncedlyrics commit: [here](https://github.com/moehmeni/syncedlyrics/commit/64d3f9de3d17bec69cbc3b3b5acd1ab847fde4b2) +--- + spotdl/utils/lrc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py +index 726fefbee..e59490b53 100644 +--- a/spotdl/utils/lrc.py ++++ b/spotdl/utils/lrc.py +@@ -7,7 +7,7 @@ + from pathlib import Path + + from syncedlyrics import search as syncedlyrics_search +-from syncedlyrics.utils import is_lrc_valid, save_lrc_file ++from syncedlyrics.utils import has_translation, save_lrc_file + + from spotdl.types.song import Song + +@@ -25,7 +25,7 @@ def generate_lrc(song: Song, output_file: Path): + - output_file: Path to the output file + """ + +- if song.lyrics and is_lrc_valid(song.lyrics): ++ if song.lyrics and has_translation(song.lyrics): + lrc_data = song.lyrics + else: + try: + +From bfa9456049132e64b5c83655bdeae7c9dcd1b532 Mon Sep 17 00:00:00 2001 +From: Jeremy Cutler <jerz4lunch@users.noreply.github.com> +Date: Wed, 26 Jun 2024 18:06:59 -0700 +Subject: [PATCH 2/2] Update lrc.py + +Seems to have fixed the update of syncedlyrics to 1.0.0 +--- + spotdl/utils/lrc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py +index e59490b53..cf7478214 100644 +--- a/spotdl/utils/lrc.py ++++ b/spotdl/utils/lrc.py +@@ -7,7 +7,7 @@ + from pathlib import Path + + from syncedlyrics import search as syncedlyrics_search +-from syncedlyrics.utils import has_translation, save_lrc_file ++from syncedlyrics.utils import has_translation, Lyrics + + from spotdl.types.song import Song + +@@ -34,7 +34,7 @@ def generate_lrc(song: Song, output_file: Path): + lrc_data = None + + if lrc_data: +- save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) ++ Lyrics.save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) + logger.debug("Saved lrc file for %s", song.display_name) + else: + logger.debug("No lrc file found for %s", song.display_name) diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index 8a614ef4083c8..7905bab5b1395 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -35,10 +35,10 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/rhasspy/wyoming-openwakeword/v${version}/master/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/wyoming-piper/v${version}/master/CHANGELOG.md"; description = "Wyoming Server for Piper"; mainProgram = "wyoming-piper"; - homepage = "https://github.com/rhasspy/wyoming-openwakeword"; + homepage = "https://github.com/rhasspy/wyoming-piper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 9e36f7572df15..56a5a9313911e 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -22,12 +22,12 @@ }: stdenv.mkDerivation rec { - version = "2.7.14"; + version = "2.7.15"; pname = "dar"; src = fetchzip { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-qesq+Rqo/llvQ7JPqYwLhObwZw2GlhXpYyc6NEA9c4M="; + sha256 = "sha256-2CuPqb17E2bHBuwRPA0QoIeTUq/lJZ3pFKbtqsRPktk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index a1f9365be8095..43289247e9435 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.27"; + version = "0.3.31"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-atQ355w9BRUJKkvuyJupcNexVEnVcYsWRvnNmpBw8OA="; + sha256 = "sha256-ASOca6HMXlnA78LbHALk9Fi9kiqjQmjp2OPLYpqhbwQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 5f1ff957b6346..198a5dda05932 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-TSUhrtSgGIPM/cUzA6WDtCpqCyjtnM5BZDhK6udR0Ek="; + hash = "sha256-WwySXQU8eoyQRcI+zF+pIIKLEFheTnqkPTw0IZeUrhA="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-E+Erf8AdlMBdep1g2SpI8JKIdJuKqmyWEUmh8Rs5R/o="; + vendorHash = "sha256-VZTX0LPZkqN4+OaaIkwepbGwPtud8Cu7Uq7t1bAUC8M="; subPackages = [ "cmd/restic" ]; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 1f66be687bc95..45713d5b8e62b 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcpcd, iproute2 -, gnome, librsvg, wrapGAppsHook3, gobject-introspection +, adwaita-icon-theme, librsvg, wrapGAppsHook3, gobject-introspection , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome.adwaita-icon-theme networkmanager ] + adwaita-icon-theme networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index a3f7378c205ce..ac87be61a4443 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -2,10 +2,10 @@ , fetchFromGitHub , stdenv , acl -, gnome , glibmm_2_68 , gtkmm4 , meson +, nautilus , ninja , pkg-config , itstool @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { acl glibmm_2_68 gtkmm4 - gnome.nautilus + nautilus ]; mesonFlags = [ diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/tools/filesystems/exfatprogs/default.nix index 997aeec80fa7c..e8f17431069b2 100644 --- a/pkgs/tools/filesystems/exfatprogs/default.nix +++ b/pkgs/tools/filesystems/exfatprogs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "exFAT filesystem userspace utilities"; homepage = "https://github.com/exfatprogs/exfatprogs"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ zane ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 6afbda9f27cde..def4a79389629 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.13"; + version = "1.14"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-ngpC1KtUsIJOfpJ9dSqZn9XhKkJSpp2/6RBz/RlZ+A0="; + hash = "sha256-A70AxYPKph/5zRNFRDWrwl8Csc8Vf1gmOLJ39ixJgL0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 518a5ca55f5cc..2bca01f54527c 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -1,32 +1,30 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub -, stdenv }: -# JuiceFS 1.1.2 doesn't build with Go 1.22. Fixed in upstream. This can be -# reverted in future releases. https://github.com/juicedata/juicefs/issues/4339 -buildGo121Module rec { +buildGoModule rec { pname = "juicefs"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sf68N5ZKveKM6xZEqF7Ah0KGgOx1cGZpJ2lYkUlgpI0="; + hash = "sha256-qPdrcWCD8BYwRwnynNhcti7eUskgHP1kAS6KiS0LHsc="; }; - vendorHash = "sha256-ofUo/3EQPhXPNeD/3to5oFir/3eAaf9WBHR4DOzcxBQ="; + vendorHash = "sha256-tKbn/dFnYTc0fYwYUrrpdN1hzx047yQSFdTG94CifhM="; - ldflags = [ "-s" "-w" ]; + excludedPackages = [ "sdk/java/libjfs" ]; - doCheck = false; # requires network access + ldflags = [ + "-s" + "-w" + "-X github.com/juicedata/juicefs/pkg/version.version=${version}" + ]; - # we dont need the libjfs binary - postFixup = '' - rm $out/bin/libjfs - ''; + doCheck = false; # requires network access postInstall = '' ln -s $out/bin/juicefs $out/bin/mount.juicefs @@ -37,6 +35,5 @@ buildGo121Module rec { homepage = "https://www.juicefs.com/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index afbe1c9c7c580..0c837e14cc448 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -27,18 +27,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.6.7"; + version = "3.6.8"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "refs/tags/stratisd-v${version}"; - hash = "sha256-cODi0YWAcnMs7bWu1oCtcZ0Wz9FAjBcoyam0G6GH7Xc="; + hash = "sha256-cYd2oy9reY8eWSdO98cVcz6/Z+MS26NY4U3UNVfMdbg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit pname version src; - hash = "sha256-eCuCqFwGm7pslyKTwk2iX42omM3gFeXrAy/2ll+tJts="; + hash = "sha256-1KzOKo5Q1uBqO3aCBYUJJxla4873AzrwoFPaNpKKFJU="; }; postPatch = '' diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/tools/games/steam-rom-manager/default.nix index a58bcf55f34bd..7232f5ad1734a 100644 --- a/pkgs/tools/games/steam-rom-manager/default.nix +++ b/pkgs/tools/games/steam-rom-manager/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { name = "steam-rom-manager"; - version = "2.5.11"; + version = "2.5.16"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-KeJ1O7YZOP8l09XFIa043tEAAU6bwpvCsJQ5r5aeuQY="; + sha256 = "sha256-u9nLeb9wRreUi2oVlNVj9F1nKj3KxrkqfTJBohOOk18="; }; extraInstallCommands = let diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index aeec2ffb4939e..ec0b4ffdf7941 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GL Easy Extension Library"; homepage = "https://sourceforge.net/p/glee/glee/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ crertel ]; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/graphics/maskromtool/default.nix b/pkgs/tools/graphics/maskromtool/default.nix index 7be41a4105085..62afa6ef8dc07 100644 --- a/pkgs/tools/graphics/maskromtool/default.nix +++ b/pkgs/tools/graphics/maskromtool/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maskromtool"; - version = "2024-05-19"; + version = "2024-06-23"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${version}"; - hash = "sha256-cG1OT5sbDW7uU7t+uh7GAdabd2zRlDTan2qPxBNHJTo="; + hash = "sha256-b/mmp8byb+4PZJNtiXB2XYbLaQPEDKaVc4gSHfytFUc="; }; buildInputs = [ diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/tools/graphics/vkbasalt-cli/default.nix index efe704ace2935..4d99b4efb4133 100644 --- a/pkgs/tools/graphics/vkbasalt-cli/default.nix +++ b/pkgs/tools/graphics/vkbasalt-cli/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { description = "Command-line utility for vkBasalt"; homepage = "https://gitlab.com/TheEvilSkeleton/vkbasalt-cli"; license = with licenses; [ lgpl3Only gpl3Only ]; - maintainers = with maintainers; [ martfont ]; + maintainers = with maintainers; [ ]; mainProgram = "vkbasalt"; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix new file mode 100644 index 0000000000000..8574b04875f0b --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-pinyin/default.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + intltool, + pkg-config, + python3, + wrapGAppsHook3, + glib, + gtk3, + ibus, + lua, + pyzy, + sqlite, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "ibus-pinyin"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "ibus"; + repo = "ibus-pinyin"; + rev = version; + hash = "sha256-8nM/dEjkNhQNv6Ikv4xtRkS3mALDT6OYC1EAKn1zNtI="; + }; + + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + python3 + wrapGAppsHook3 + ]; + + buildInputs = [ + glib + gtk3 + ibus + lua + pyzy + sqlite + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + isIbusEngine = true; + description = "The PinYin engine for IBus"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ azuwis ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index d88c00fb79836..db93a966b798b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.17.4"; + version = "1.17.6"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-XljpwsDsdZkcnXimnN7BzPhOZdUmEEJbBM53Sv/9rIo="; + sha256 = "sha256-rbtyixsDMIQAP2TLqp1KbcCUMc7cKvGQR27puJmbLno="; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/tools/inputmethods/keymapper/default.nix index 6ed0ad69db9dd..a9124086bf9fc 100644 --- a/pkgs/tools/inputmethods/keymapper/default.nix +++ b/pkgs/tools/inputmethods/keymapper/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-NB9sVSkd01lm9Ia8fGrnICjD1cNdPfcvJ++Yy3NO5QQ="; + hash = "sha256-pM273Ma8ELFVQV8zxCmtEvhBz5HLiIBtPtRv9Hh5dGY="; }; # all the following must be in nativeBuildInputs diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 67fa9dcf4e90d..1189cca853796 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -86,7 +86,7 @@ let description = "Bash scripts that integrate bat with various command line tools"; homepage = "https://github.com/eth-p/bat-extras"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ bbigras lilyball ]; + maintainers = with maintainers; [ bbigras ]; platforms = platforms.all; }; }; diff --git a/pkgs/tools/misc/cp210x-program/default.nix b/pkgs/tools/misc/cp210x-program/default.nix index b734008fad2a9..d53a406c3cdc4 100644 --- a/pkgs/tools/misc/cp210x-program/default.nix +++ b/pkgs/tools/misc/cp210x-program/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { description = "EEPROM tool for Silabs CP210x USB-Serial adapter"; homepage = "https://github.com/VCTLabs/cp210x-program"; license = licenses.lgpl21Only; # plus/only status unclear - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; mainProgram = "cp210x-program"; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 89af942966a6b..8a85cc112fd32 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -96,11 +96,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "269"; + version = "271"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-L2UygmcTXgcc9l8ALpOS52+2dhsO42733nlc1Hzl8L8="; + hash = "sha256-YwNaYj0daYbs3rN/EcPz5LihJjZ6JZb33FSS6u98Gss="; }; outputs = [ @@ -108,9 +108,6 @@ python.pkgs.buildPythonApplication rec { "man" ]; - # https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378 - sourceRoot = "./-269"; - patches = [ ./ignore_links.patch ./openssh-no-dsa.patch # https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests/139 diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/tools/misc/fedifetcher/default.nix index 1210b7146fdba..bca508165e4f9 100644 --- a/pkgs/tools/misc/fedifetcher/default.nix +++ b/pkgs/tools/misc/fedifetcher/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "fedifetcher"; - version = "7.1.1"; + version = "7.1.4"; format = "other"; src = fetchFromGitHub { owner = "nanos"; repo = "FediFetcher"; rev = "refs/tags/v${version}"; - hash = "sha256-HMpLn73PTk3kwlNof4EZhRHRlHUEfzJt5raYaEqWrjI="; + hash = "sha256-/iAmX2kBYJgtsz7b817UqLXkwVwXi7EY4KL0ZYxXYBw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index ae377b63812f4..7a06d96300c2d 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://gitlab.com/timvisee/ffsend"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lilyball equirosa ]; + maintainers = with maintainers; [ equirosa ]; platforms = platforms.unix; mainProgram = "ffsend"; }; diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix index fba442e4aa0c0..e041202576fbc 100644 --- a/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://onlinesupport.fujixerox.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ delan ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 4675789c59149..c5901a6cd6e19 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotify-cli"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "gotify"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mOIomHNA20gKU7uh2Sf4NqqLNjNnD5hgOTUu9DuduiI="; + sha256 = "sha256-Hzdd9T8RcLxHG+vHb4KuKqW4SwcWDrVc6DZ0QUpH2Xc="; }; - vendorHash = "sha256-ObJfUIy2GwogFm2/uCmShEXnIxDTqWWXCZPu9KJVFOA="; + vendorHash = "sha256-+G0LWlPiDcYmEou4gpoIU/OAjzQ3VSHftM1ViG9lhYM="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index d12babfddfafd..eef6062c73a57 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, gettext, coreutils, gnused, gnome +, adwaita-icon-theme , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook3, substituteAll , mtools, dosfstools @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin adwaita-icon-theme ]; nativeBuildInputs = [ gettext pkg-config wrapGAppsHook3 ]; preConfigure = '' diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2b5878f7a638e..c405f7a90751a 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook3, pcre-cpp, gnome }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook3, pcre-cpp, adwaita-icon-theme }: stdenv.mkDerivation rec { pname = "gsmartcontrol"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook3 ]; - buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; + buildInputs = [ gtkmm3 pcre-cpp adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 16b0f64a22079..58842ba6b55d8 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.37"; + version = "0.10.38"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-WcX/H0zGXbkf5mM5Xq07UuQixUCCUXRPmBVrf3V4TEM="; + sha256 = "sha256-cnZ7ASYm1IhlqskWMEWzaAG6XKEex7P3akjmYUjHSzc="; }; vendorHash = "sha256-bLSj4/+7h0uHdR956VL4iLqRddKV5Ac+FIL1zJxPCW8="; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 0b33329e1bebf..c08bf5e9b1022 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "1.21.1-unstable-2024-05-31"; + version = "1.21.1-unstable-2024-06-27"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "e965f179e1654103eca33feed7a9cc4c51d91be6"; - hash = "sha256-32LYNF+5z5rS4y2iGKA2BnQntXg9Ec9709m6pL5hBdo="; + rev = "b66e27d9b29a172a097c737ab4d378d60fe01b05"; + hash = "sha256-TKZ4WjNV2oZIYNefch7E7m1JpeoC/d7O1kofoNv8G40="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index fc2aa1400758a..a93a9c9c83798 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, zenity }: stdenv.mkDerivation rec { pname = "kodi-cli"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a kodi-cli $out/bin wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash zenity jq youtube-dl ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/lerpn/default.nix b/pkgs/tools/misc/lerpn/default.nix index 8e35a5b0b1079..f6714310f2989 100644 --- a/pkgs/tools/misc/lerpn/default.nix +++ b/pkgs/tools/misc/lerpn/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication { meta = with lib; { homepage = "https://gitea.alexisvl.rocks/alexisvl/lerpn"; description = "Curses RPN calculator written in straight Python"; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; mainProgram = "lerpn"; }; diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index c9baf275b4d20..9ee54115e6931 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.14"; + version = "3.0.0"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-kj0tkI87pgYdJNlQXCRpVhg7IjvWTDBDeXqePO0HZNo="; + sha256 = "sha256-kCD7PovmEU27q9zhXypOHiCy3tHipvuCLVHRcxjHObM="; }; - vendorHash = "sha256-P7AqMSV05UKeiUqWBxCOlLwMJcAtp0lpUC+eoE3JZFM="; + vendorHash = "sha256-SDI36+35yFy7Fp+VrnQMyIDUY1kM2tylwdS3I9E2vyk="; doCheck = false; diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix index 308605e1172fe..cff5d74a9bd21 100644 --- a/pkgs/tools/misc/mandown/default.nix +++ b/pkgs/tools/misc/mandown/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mandown"; - version = "0.1.3"; + version = "0.1.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-8a4sImsjw+lzeVK4V74VpIKDcAhMR1bOmJYVWzfWEfc="; + sha256 = "sha256-8SHZR8frDHLGj2WYlnFGBWY3B6xv4jByET7CODt2TGw="; }; - cargoHash = "sha256-Wf1+dxwgPZ4CHpas+3P6n6kKDIISbnfI01+XksjxQlQ="; + cargoHash = "sha256-/IvPvJo5zwvLY+P5+hsdbR56/pfopfwncEz9UGUS1Oc="; meta = with lib; { description = "Markdown to groff (man page) converter"; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 4140308c4967a..888b8727c5d49 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.15"; + version = "1.24.3"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-tRjKBHsNJL66oz+0gZTrL8xFHQEyHLG+W35LHUYQKwU="; + hash = "sha256-3jSCZ4VsqYL2hGyv3aED2L2KKzurSdA/JxzDUypDoNI="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 45716202878ff..861aa70b915ef 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -4,7 +4,8 @@ , dconf , fetchFromGitHub , glib -, gnome +, nautilus +, nautilus-python , gobject-introspection , gsettings-desktop-schemas , gtk3 @@ -37,8 +38,8 @@ python3.pkgs.buildPythonPackage rec { buildInputs = [ dbus dconf - gnome.nautilus - gnome.nautilus-python + nautilus + nautilus-python gsettings-desktop-schemas gtk3 python3.pkgs.pygobject3 diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/tools/misc/open-pdf-sign/default.nix index 76d957d340adc..1b87ca87728e3 100644 --- a/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/pkgs/tools/misc/open-pdf-sign/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.2.0"; + version = "0.2.1"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${finalAttrs.version}/open-pdf-sign.jar"; - hash = "sha256-W4WymhjLrHtNK5XY8aahpZOIIh/Qp9scE3zybXF6/9o="; + hash = "sha256-jtaEystCiZUK93HkVPuWzAUISO4RMMxjMmFbooWZJGU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index b9f3d12c0a928..05e5f94254624 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.101.0"; + version = "0.103.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-BRZxeTFw4v4LLXPPzIzcjtR/RTckpolGGcB6jyq+ZOA="; + hash = "sha256-xmsxr1A0/kyWXLNVZglZy8K7ieZT1GS4lGqsSrUkttI="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-dO0j26AlpibsmbOqozz9+xMAJS/ZZHT6Z857AblYFHA="; + vendorHash = "sha256-1NDGfzg/60VJNrWkMtGS2t3Cv1CXSguR1qLp4mqF1UM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index e68ed0e5cd009..886b611b34644 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240522"; + version = "20240622"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - hash = "sha256-Z+2frTG/PiXwnVAOfoyn3546w4D+Tr0WxvAURIo0aSg="; + hash = "sha256-N+IQyQe9RDx9W2JgcegV3A1pHQZSmStn0MKsw0y/ONU="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix index 143e340a4c0d7..e5cb03d01dc11 100644 --- a/pkgs/tools/misc/pfetch-rs/default.nix +++ b/pkgs/tools/misc/pfetch-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-1Mw20O64I0UeAOO4Gea8cAbNnHkWOMvoRawIAZ62kTI="; + hash = "sha256-Sq5bHbUxZxgbCmekKVNlgVAXTAxY2sSPgUeFJ/nzkU4="; }; - cargoHash = "sha256-Jx8g49rMatXMV1KvoFGBhXKmf77WR4uE/Xewl5TMeWM="; + cargoHash = "sha256-nEI2boe7bP/c5WKl7LifQNA2VxMvpxGeCyHcwr3aG7E="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 1b9986a80dcda..79a7a221a947a 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.29.0"; + version = "2.30.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-5f38D1+nK/yxJSdw4pgCfmWYlgCFxaE9Oey8/UwvR30="; + sha256 = "sha256-eeGoOBLQMp44Y7z3VQN+gaL1uJmyKNV1BmYSOhhjDkw="; }; - vendorHash = "sha256-Uqp+ZEdWDW5sA9EfjYX2ydMGmcGI4rPUINb3D2RlrQY="; + vendorHash = "sha256-pBIAcEmEWmjy1TE8EwZ3vmNmDdolyam/vxY5XHMXU+E="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix index 68df99eb476b5..6612826be2d62 100644 --- a/pkgs/tools/misc/pipectl/default.nix +++ b/pkgs/tools/misc/pipectl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-Ixch5iyeIjx+hSvln8L0N8pXG7ordpsFVroqZPUzAG0="; + hash = "sha256-uBKHGR4kv62EMOIT/K+WbvFtdJ0V5IbsxjwQvhUu9f8="; }; nativeBuildInputs = [ cmake scdoc ]; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 029c1077cc52c..228900abf9dd2 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.4.3"; + version = "0.5"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xzVVOx5Uz10Bv8LDRuqqxyjdYp1JKhQPb3ws2l6Dg2Y="; + sha256 = "sha256-C0X9LdCgfv+IFHsNLOumH1e/RAh6NycmE/J4SdA6AMs="; }; - vendorHash = "sha256-9+eWTpz2VcNtEwVtVdNPjXYdG7XjB7cvC4WWvxF7Lvs="; + vendorHash = "sha256-3H3XAJ9gNBd+IjxpjfUFl2/3NWN1E+6aey4i4ajOIiY="; doCheck = false; diff --git a/pkgs/tools/misc/qmk_hid/default.nix b/pkgs/tools/misc/qmk_hid/default.nix index f5d1b61868a3a..b0835dbcb5770 100644 --- a/pkgs/tools/misc/qmk_hid/default.nix +++ b/pkgs/tools/misc/qmk_hid/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "Commandline tool for interactng with QMK devices over HID"; homepage = "https://github.com/FrameworkComputer/qmk_hid"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "qmk_hid"; }; } diff --git a/pkgs/tools/misc/rkvm/default.nix b/pkgs/tools/misc/rkvm/default.nix index bf6ef6e482d00..162899b46e809 100644 --- a/pkgs/tools/misc/rkvm/default.nix +++ b/pkgs/tools/misc/rkvm/default.nix @@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/htrefil/rkvm/releases/tag/${version}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/script-directory/default.nix b/pkgs/tools/misc/script-directory/default.nix index 95ab361782f6d..55be6b327f3e3 100644 --- a/pkgs/tools/misc/script-directory/default.nix +++ b/pkgs/tools/misc/script-directory/default.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/ianthehenry/sd"; changelog = "https://github.com/ianthehenry/sd/tree/${src.rev}#changelog"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ janik ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sd"; }; } diff --git a/pkgs/tools/misc/sensible-utils/default.nix b/pkgs/tools/misc/sensible-utils/default.nix index 4584de1f8fdda..c60220c0341cd 100644 --- a/pkgs/tools/misc/sensible-utils/default.nix +++ b/pkgs/tools/misc/sensible-utils/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sensible-utils"; - version = "0.0.23"; + version = "0.0.24"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "sensible-utils"; rev = "debian/${version}"; - sha256 = "sha256-EiWrMDVfauCBHmpJOoJFWOdigtDiNc5DzDoeyWhke9k="; + sha256 = "sha256-omdg5df/TxURarrqawsB3+B85siDJxDaex/2rx5csXI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index dec0e1b453359..aa72ecb5d980c 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/tmux/tmux/commit/4f5a944ae3e8f7a230054b6c0b26f423fa738e71.patch"; hash = "sha256-HlUeU5ZicPe7Ya8A1HpunxfVOE2BF6jOHq3ZqTuU5RE="; }) + # https://github.com/tmux/tmux/issues/3983 + # fix tmux crashing when neovim is used in a ssh session + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch"; + hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 3b632348f2639..8b037912a80da 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "14.0.1"; + version = "15.0.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-opTMV+OH8PR9SxBWj1o8xSngK0QdindDcXyd6TRjdvI="; + hash = "sha256-w3JsMUuARJ5UtA8Io3kzeNjXoa014YzyT8hHPwEgljQ="; }; - cargoHash = "sha256-pgYrUZAxoyllQp1HuVhbLR3za+Gx0l8Z2/Zq/KCOKZg="; + cargoHash = "sha256-DEZlpt9mOy/BOnvkkINz2+q3hUx2aBSzBfOVxv43w6g="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 0e88aa91c863b..1b3c920eca091 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.25"; + version = "0.0.27"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - hash = "sha256-25jmlGxMWzAaJEmMHruA6H+nqx2QHnYX9c9SKqrQRE4="; + hash = "sha256-6MbX3C5NVwiOwXW5xJO2X3qKMh3pUSALR9aK2IbgaaU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-lQoOkiSga2aS8GNgLcHdid1/1u3johYEcGi9oOVsdJs="; + hash = "sha256-JowORfYHxN8GqvWeUm0ACnHNM3uZviYbhR7BOeAfphw="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/misc/wayback/default.nix b/pkgs/tools/misc/wayback/default.nix index 3fb220c4001ec..7d7068e7a4180 100644 --- a/pkgs/tools/misc/wayback/default.nix +++ b/pkgs/tools/misc/wayback/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "wayback"; - version = "0.19.1"; + version = "0.20.1"; src = fetchFromGitHub { owner = "wabarc"; repo = "wayback"; rev = "v${version}"; - hash = "sha256-LIWCT0/5T52VQQK4Dy6EFmFlJ02MkfvKddN/O/5zpZc="; + hash = "sha256-GnirEgJHgZVzxkFFVDU9795kgvMTitnH+xWd7ooNf7Y="; }; - vendorHash = "sha256-TC4uwJswpD5oKqF/rpXqU/h+k0jErwhguT/LkdBA83Y="; + vendorHash = "sha256-vk9c+U8mKwT03dHV9labvCOM2Ip1vk7AeiTleEBuNP4="; doCheck = false; diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index e8d8098ad95c6..4212e96586be7 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.7.6"; + version = "2.8.0"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "sha256-AFPuHxcDM/cdEJ5nRJnVbPk7Deg97NeSMsg/qwytZX4="; + sha256 = "sha256-JqdOgcwOXIJDl8O7k/pHdd4MNC/rJ0fWTowtEVpJyx8="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index 67d09807afc9e..e0b7d61616f2f 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.4.0"; + version = "0.4.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-pQhzyXLurFnBn9DkkXA54NsAX8wE4rQvaHXZLkLDwdw="; + sha256 = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; }; - cargoHash = "sha256-gfCH/jnJTUiqwzxUYuZuFWh9Wq8hp43z2gRdaDQ908g="; + cargoHash = "sha256-R2ng5l2l/5vWnTJ3kt3cURNWL4Lo55yGbSE+9hjQu20="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/tools/misc/xxv/default.nix index cd0208dd9ecf4..1cb13709bb890 100644 --- a/pkgs/tools/misc/xxv/default.nix +++ b/pkgs/tools/misc/xxv/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://chrisvest.github.io/xxv/"; license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ lilyball ]; + maintainers = with maintainers; [ ]; mainProgram = "xxv"; }; } diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index d4e1f6df6dc4f..ef14e8e11eab4 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.5.27"; + version = "2024.7.2"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-NWbA3iQNDNPRwihc5lX3LKON/GGNY01GgYsA2J1SiL4="; + hash = "sha256-KwyGtXnUoETq88SwDj17JNgubiaGn6EcKI6kOVs4f0E="; }; build-system = [ diff --git a/pkgs/tools/misc/zitadel-tools/default.nix b/pkgs/tools/misc/zitadel-tools/default.nix index cd5ae370805bb..0ef9b344320d0 100644 --- a/pkgs/tools/misc/zitadel-tools/default.nix +++ b/pkgs/tools/misc/zitadel-tools/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Helper tools for zitadel"; homepage = "https://github.com/zitadel/zitadel-tools"; license = licenses.asl20; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "zitadel-tools"; }; } diff --git a/pkgs/tools/misc/zthrottle/default.nix b/pkgs/tools/misc/zthrottle/default.nix index 8789af2881460..aa1d3c1c4fbf4 100644 --- a/pkgs/tools/misc/zthrottle/default.nix +++ b/pkgs/tools/misc/zthrottle/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Program that throttles a pipeline, only letting a line through at most every $1 seconds"; homepage = "https://github.com/anko/zthrottle"; license = licenses.unlicense; - maintainers = [ maintainers.ckie ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "zthrottle"; }; diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 3a08ec85083aa..baa1b1a98ad45 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "arping"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-rME4IDzwYHOURbyuG7G5gnXvUIVoQH2WIeLWacHyoBA="; + hash = "sha256-SAdbgPmApmFToYrAm8acUapZMEMQr5MO7bQOTO2hd2c="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index f32e9ff7542ca..1ffbe6a603d37 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "DNS query tool"; homepage = "https://crates.io/crates/bore"; license = licenses.isc; - maintainers = [ maintainers.delan ]; + maintainers = [ ]; mainProgram = "bore"; broken = stdenv.isDarwin; # bindgen fails on: "in6_addr_union_(...)" is not a valid Ident }; diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index 4a0f842071369..0f6207a53e755 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -73,6 +73,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/user/warp-taskbar.service \ --replace "ExecStart=" "ExecStart=$out" + cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF + + [Service] + BindReadOnlyPaths=$out:/usr: + EOF + runHook postInstall ''; diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/tools/networking/cnping/default.nix index ec3a0e03c2881..e998e94b3d706 100644 --- a/pkgs/tools/networking/cnping/default.nix +++ b/pkgs/tools/networking/cnping/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Minimal Graphical IPV4 Ping Tool"; homepage = "https://github.com/cntools/cnping"; license = with licenses; [ mit bsd3 ]; # dual licensed, MIT-x11 & BSD-3-Clause - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "cnping"; }; diff --git a/pkgs/tools/networking/curl-impersonate/default.nix b/pkgs/tools/networking/curl-impersonate/default.nix index f8ec8253c6daa..431824163c0b8 100644 --- a/pkgs/tools/networking/curl-impersonate/default.nix +++ b/pkgs/tools/networking/curl-impersonate/default.nix @@ -173,7 +173,7 @@ let description = "Special build of curl that can impersonate Chrome & Firefox"; homepage = "https://github.com/lwthiker/curl-impersonate"; license = with licenses; [ curl mit ]; - maintainers = with maintainers; [ deliciouslytyped lilyinstarlight ]; + maintainers = with maintainers; [ deliciouslytyped ]; platforms = platforms.unix; mainProgram = "curl-impersonate-${name}"; }; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 4116e28858edc..0b1d157af5d31 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGoModule +, buildGo121Module , makeWrapper , fetchFromGitHub , pythonPackages @@ -37,7 +37,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGoModule rec { +in buildGo121Module rec { pname = "datadog-agent"; inherit src version; diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix index 3fb812a38ee74..59f61d9af7101 100644 --- a/pkgs/tools/networking/fast-ssh/default.nix +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -1,32 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, rustPlatform -, Security +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + Security, }: rustPlatform.buildRustPackage rec { pname = "fast-ssh"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "julien-r44"; repo = "fast-ssh"; - rev = "v${version}"; - sha256 = "sha256-eHJdMe8RU6Meg/9+NCfIneD5BqNUc2yIiQ8Z5UqUBUI="; + rev = "refs/tags/v${version}"; + hash = "sha256-Wn1kwuY1tRJVe9DJexyQ/h+Z1gNtluj78QpBYjeCbSE="; }; - cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0="; - - patches = [ - # Can be removed as soon as this is is merged: https://github.com/Julien-R44/fast-ssh/pull/22 - (fetchpatch { - name = "fix-ambiguous-as_ref.patch"; - url = "https://github.com/Julien-R44/fast-ssh/commit/c082a64a4b412380b2ab145c24161fdaa26175db.patch"; - hash = "sha256-egkoJF+rQiuClNL8ltzmB7oHngbpOxO29rlwZ3nELOE="; - }) - ]; + cargoHash = "sha256-CJ3Xx5jaTD01Ai7YAY4vB7RB5lU1BIXq7530B6+KeX4="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 8969ef275267d..3e89da8ed7fe8 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.27.0"; + version = "3.28.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-RxBAnElmQkrkMuIC0UpneJXN1OiPhaTPm/tYvc8QSg8="; + sha256 = "sha256-HdGRZrMukIQLxTmwTVB/zUlnrhDjq5b6ree7aqx8pRE="; }; vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A="; diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 0d3dcb3cabcd8..e7408559567fb 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "hysteria"; - version = "2.4.5"; + version = "2.5.0"; src = fetchFromGitHub { owner = "apernet"; repo = pname; rev = "app/v${version}"; - hash = "sha256-dRVTlH+g/pwwacrdof3n8OeLMsgZswpOwvtAx13bZGo="; + hash = "sha256-vtGJRPQBOO8Ig794FJ3gTrR0LOZdWH1vAc7IcZSq/SE="; }; - vendorHash = "sha256-nrcREOp92jIB8CzdOevYufpIN6l9Tcg/B4tT15d5TOE="; + vendorHash = "sha256-1VLws98/iAW8BnxOhbshp01D6+kb4CJOvncC5floN5o="; proxyVendor = true; ldflags = diff --git a/pkgs/tools/networking/labctl/default.nix b/pkgs/tools/networking/labctl/default.nix index 921bf7c4e3bfc..71593411e8974 100644 --- a/pkgs/tools/networking/labctl/default.nix +++ b/pkgs/tools/networking/labctl/default.nix @@ -46,7 +46,7 @@ buildGoModule rec { description = "collection of helper tools for network engineers, while configuring and experimenting with their own network labs"; homepage = "https://labctl.net"; license = licenses.asl20; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; mainProgram = "labctl"; }; } diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 16476ab33fba6..ddaee847c44f6 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "miniupnpd"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz"; - sha256 = "sha256-Ecp79NS6bGuhLHDDBBgH9Rb02fa2aXvqBOg3YmudZ5w="; + sha256 = "sha256-+91VAQOXMPBKhCDqL49Ut99j+fBM3i3Gf6c3HoBHe74="; }; buildInputs = [ iptables-legacy libuuid openssl ] diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix index ea2fc8604650d..070c7fabc1a6d 100644 --- a/pkgs/tools/networking/muffet/default.nix +++ b/pkgs/tools/networking/muffet/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-/LkXFY7ThPuq3RvW0NLZNRjk9kblFiztG98sTfhQuGM="; + hash = "sha256-v4qyVaeqSSG9cmkSGeweZIVv3Dgk/mHHvUpA0Cbio3c="; }; - vendorHash = "sha256-3kURSzwzM4QPCbb8C1vRb6Mr46XKNyZF0sAze5Z9xsg="; + vendorHash = "sha256-UJsncAKtjgF0dn7xAJQdKD8YEIwtFcpYJVWG9b66KRU="; meta = with lib; { description = "Website link checker which scrapes and inspects all pages in a website recursively"; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index 9b485dafa675a..9d58389bae571 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -6,6 +6,7 @@ , pkg-config , networkmanager , gnome +, adwaita-icon-theme , libsecret , polkit , modemmanager @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { glib glib-networking libayatana-appindicator - gnome.adwaita-icon-theme + adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 381dc1582f925..034a4847abd57 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -131,6 +131,9 @@ stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch + + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966 + ./without-systemd.patch ]; buildInputs = [ diff --git a/pkgs/tools/networking/networkmanager/without-systemd.patch b/pkgs/tools/networking/networkmanager/without-systemd.patch new file mode 100644 index 0000000000000..b48b21da1c85e --- /dev/null +++ b/pkgs/tools/networking/networkmanager/without-systemd.patch @@ -0,0 +1,67 @@ +From 70d1c34b94baadc3305745cf159ea55f312beacc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Jun 2024 14:03:15 -0700 +Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid + function + +When building on musl systems ( with out systemd ), and using LLD linker +from LLVM project we fail to link with undefined symbols. + +This symbol is in sd_id128.c but its disabled, so let disable the functions +which need this function. + +| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific +| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202) +| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a +| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation) + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++ + .../src/libsystemd-network/sd-dhcp6-client.c | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +index e664a4a720..7ba502086f 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) { + return 0; + } + ++#if 0 + int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + sd_id128_t machine_id; + int r; +@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); + return 0; + } ++#endif + + int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { + _cleanup_free_ char *p = NULL, *x = NULL; +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +index 7c20116409..08c1e96b3c 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) { + return 0; + } + ++#if 0 + int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + int r; + +@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + + return 0; + } +- ++#endif + int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { + int r; + +-- +GitLab + diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/tools/networking/ntpd-rs/default.nix index 2803d72110580..264d07428fc3c 100644 --- a/pkgs/tools/networking/ntpd-rs/default.nix +++ b/pkgs/tools/networking/ntpd-rs/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; rev = "v${version}"; - hash = "sha256-0ykJruuyD1Z/QcmrogodNlMZp05ocXIo3wdygB/AnT0="; + hash = "sha256-7b0IZLTt9ROEhp9bOBOvNQmS+iuQjgSrdwL1Nxy46t4="; }; - cargoHash = "sha256-Badq3GYr7BoF8VNGGtKTT4/ksuds1zBcSxx5O3vLbzg="; + cargoHash = "sha256-FgRVWo27gdIzUNNTqgu7oHwrKSaWDA+sgL8kGak0otA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ @@ -39,6 +39,10 @@ rustPlatform.buildRustPackage rec { source utils/generate-man.sh ''; + # tests don't compile for 1.1.3 + # https://github.com/pendulum-project/ntpd-rs/actions/runs/9712796372/job/26808251482 + doCheck = false; + checkFlags = [ # doesn't find the testca "--skip=daemon::keyexchange::tests" diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix index 4eedbaa0deddd..6b354f3b33986 100644 --- a/pkgs/tools/networking/octodns/default.nix +++ b/pkgs/tools/networking/octodns/default.nix @@ -59,6 +59,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns"; changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/bind/default.nix b/pkgs/tools/networking/octodns/providers/bind/default.nix index d89576c755750..18cd54f0f0815 100644 --- a/pkgs/tools/networking/octodns/providers/bind/default.nix +++ b/pkgs/tools/networking/octodns/providers/bind/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns-bind"; changelog = "https://github.com/octodns/octodns-bind/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/pkgs/tools/networking/octodns/providers/hetzner/default.nix index 7ce8ceb814768..688f1c90e2b84 100644 --- a/pkgs/tools/networking/octodns/providers/hetzner/default.nix +++ b/pkgs/tools/networking/octodns/providers/hetzner/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns-hetzner/"; changelog = "https://github.com/octodns/octodns-hetzner/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix index deee1d142a316..25d5291a55946 100644 --- a/pkgs/tools/networking/octodns/providers/powerdns/default.nix +++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/octodns/octodns-powerdns/"; changelog = "https://github.com/octodns/octodns-powerdns/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 855ce3de34cba..1c60f8f304d78 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ in { openssh = common rec { pname = "openssh"; - version = "9.7p1"; + version = "9.8p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-SQQm92bYKidj/KzY2D6j1weYdQx70q/y5X3FZg93P/0="; + hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -29,6 +29,8 @@ in extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/b3f86656fc67aa397f60747c85f7f7b967c3279d/security/openssh-portable/files/extra-patch-hpn"; in [ ./ssh-keysign-8.5.patch + ./openssh-9.6_p1-CVE-2024-6387.patch + ./openssh-9.6_p1-chaff-logic.patch # HPN Patch from FreeBSD ports (fetchpatch { @@ -68,6 +70,8 @@ in extraPatches = [ ./ssh-keysign-8.5.patch + ./openssh-9.6_p1-CVE-2024-6387.patch + ./openssh-9.6_p1-chaff-logic.patch (fetchpatch { name = "openssh-gssapi.patch"; diff --git a/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch b/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch new file mode 100644 index 0000000000000..7b7fb70380d9f --- /dev/null +++ b/pkgs/tools/networking/openssh/openssh-9.6_p1-CVE-2024-6387.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/935271 +Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. +--- a/log.c ++++ b/log.c +@@ -451,12 +451,14 @@ void + sshsigdie(const char *file, const char *func, int line, int showfunc, + LogLevel level, const char *suffix, const char *fmt, ...) + { ++#ifdef SYSLOG_R_SAFE_IN_SIGHAND + va_list args; + + va_start(args, fmt); + sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, + suffix, fmt, args); + va_end(args); ++#endif + _exit(1); + } + diff --git a/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch b/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch new file mode 100644 index 0000000000000..90544d1a457ed --- /dev/null +++ b/pkgs/tools/networking/openssh/openssh-9.6_p1-chaff-logic.patch @@ -0,0 +1,16 @@ +"Minor logic error in ObscureKeystrokeTiming" +https://marc.info/?l=oss-security&m=171982317624594&w=2 +--- a/clientloop.c ++++ b/clientloop.c +@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, + if (timespeccmp(&now, &chaff_until, >=)) { + /* Stop if there have been no keystrokes for a while */ + stop_reason = "chaff time expired"; +- } else if (timespeccmp(&now, &next_interval, >=)) { +- /* Otherwise if we were due to send, then send chaff */ ++ } else if (timespeccmp(&now, &next_interval, >=) && ++ !ssh_packet_have_data_to_write(ssh)) { ++ /* If due to send but have no data, then send chaff */ + if (send_chaff(ssh)) + nchaff++; + } diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index bb12585155770..dfef255c15c9a 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pacparser"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "manugarg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qIfzAQ/dJgOZJajNU3XyFudSxu2w4JC0ffHosHXje1o="; + sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks="; }; makeFlags = [ "NO_INTERNET=1" ]; diff --git a/pkgs/tools/networking/sipexer/default.nix b/pkgs/tools/networking/sipexer/default.nix index d1be5e9f7770d..98aaf67d80e69 100644 --- a/pkgs/tools/networking/sipexer/default.nix +++ b/pkgs/tools/networking/sipexer/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/miconda/sipexer"; changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ astro janik ]; + maintainers = with maintainers; [ astro ]; mainProgram = "sipexer"; }; } diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index 619a3c773b16f..12325afc48be7 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "45"; + version = "46"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - hash = "sha256-aVGIgQkFz8A1UsHsgOSkEEE5vzp4cJEtcaKHv1EzErg="; + hash = "sha256-7JNP8vacYENBbbCxBtSpVu9j5vCBVBsQ/OeVPoRxlE4="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 16c6a40bb347d..2cb9f3b62a929 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2023.10"; + version = "2024.06"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "sha256-oCHPRqJ1zm2Ple3Ck9nMyRC7PgKaF1RuswzdGBVU2C8="; + sha256 = "sha256-iCW0oEbLLqRKaxqxhSDsmRnI5YTi4HYcg+IWRAbt9WI="; }; installPhase = '' diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index 1d860bc753648..909648f8d03c5 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "twa"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = "v${version}"; - hash = "sha256-8c1o03iwStmhjKHmEXIZGyaSOAJRlOuhu0ERjCO5SHg="; + hash = "sha256-B+UwH7oCtediLzurjYuLp56IxiKNAqyoW5QkwXX72MA="; }; dontBuild = true; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 4fe4222ff08ea..9e6961b7e5264 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.15.3"; + version = "5.16.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-45VS+Hrl7egIS2PBrgmDsKgX6vKirEFyQUKy2TBxY4U="; + hash = "sha256-bgDTraLufl6txl9TMPstuPs4IgN1pLIBlpl2VlvuN0o="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-Z3jD7auUixTgrY9Cm0LoNRHIyEFbStMYpumTCqKv+x0="; + vendorHash = "sha256-FDmwZoBN2/8jPMs7xkQiI9hFt9cgaQPHC31ueYq3n9k="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index 0cde0170b78f7..ce8b04c35fc79 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -43,6 +43,6 @@ buildPythonApplication rec { "vpnc-script replacement for easy and secure split-tunnel VPN setup"; mainProgram = "vpn-slice"; license = licenses.gpl3; - maintainers = with maintainers; [ liketechnik ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index d5cec92845501..dae32fa93f1ed 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, gettext, pkg-config, perlPackages , libidn2, zlib, pcre, libuuid, libiconv, libintl -, python3, lzip +, python3, lzip, darwin , withLibpsl ? false, libpsl , withOpenssl ? true, openssl }: stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.4"; + version = "1.24.5"; src = fetchurl { - url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - hash = "sha256-NoNhml9Q7cvMsXIKeQBvo3v5uaJVqMW0gEi8PHqHS9k="; + url = "mirror://gnu/wget/wget-${version}.tar.lz"; + hash = "sha256-V6EHFR5O+U/flK/+z6xZiWPzcvEyk+2cdAMhBTkLNu4="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] ++ lib.optional withOpenssl openssl ++ lib.optional withLibpsl libpsl - ++ lib.optional stdenv.isDarwin perlPackages.perl; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices perlPackages.perl ]; configureFlags = [ (lib.withFeatureAs withOpenssl "ssl" "openssl") diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index e4e5a1a22fda9..05948633d0cf9 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-1CdYmFKpjc3CAmHwpSJ3IL4ZrJqYo0QZ4a/yRy732IM="; - aarch64-linux = "sha256-Du/Kyb4UafEK3ssfWB3w0harAxUIlmsc5SGsxf1Dc18="; - armv7l-linux = "sha256-59tQ5sNk0QL1H+BjeiiJItTQUNWCNuWCp0wWe//VEhg="; + x86_64-linux = "sha256-8fEmiRKFOrF9v66OEfUGLUYK+DfZMkAXrCKu2DoGbLA="; + aarch64-linux = "sha256-p+YbWpyLfIgFdNvakQQFfi+P/9lhfVMM+Y0XynRJ/rY="; + armv7l-linux = "sha256-mMjtbAjylSjS+89T0qQoI4H/p316cqh+5fbgarFbv90="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.32"; + version = "0.4.34"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 4ecd812ddc2ae..a4cd170e90e44 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "2.8.5"; + version = "2.8.7"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "sha256-znvqxZWkQndxE6s36c77whUPc1UokrofTApFSIKFOtM="; + sha256 = "sha256-uL8prMk2DrYLjCmZW8DdbCg5FJ5uksT3vIATyOW2ZzY="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index e07c21950b325..cea3fb099dcea 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script"; homepage = "https://github.com/lf-/nix-doc"; license = licenses.lgpl3Plus; - maintainers = [ maintainers.lf- ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "nix-doc"; }; diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index f7b0dff33472d..e98371a1e757e 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -85,6 +85,7 @@ in # passthru tests , pkgsi686Linux +, runCommand }: let self = stdenv.mkDerivation { pname = "nix"; @@ -259,6 +260,21 @@ self = stdenv.mkDerivation { # Basic smoke test that needs to pass when upgrading nix. # Note that this test does only test the nixVersions.stable attribute. misc = nixosTests.nix-misc.default; + + srcVersion = runCommand "nix-src-version" { + inherit version; + } '' + # This file is an implementation detail, but it's a good sanity check + # If upstream changes that, we'll have to adapt. + srcVersion=$(cat ${src}/.version) + echo "Version in nix nix expression: $version" + echo "Version in nix.src: $srcVersion" + if [ "$version" != "$srcVersion" ]; then + echo "Version mismatch!" + exit 1 + fi + touch $out + ''; }; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3290b0e71b61a..cf8159ab3f626 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -183,7 +183,7 @@ in lib.makeExtensible (self: ({ }; git = common rec { - version = "2.23.1"; + version = "2.24.0"; suffix = "pre20240627_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/tools/security/beyond-identity/default.nix index 4d535cbb89e1a..417bf68558bd6 100644 --- a/pkgs/tools/security/beyond-identity/default.nix +++ b/pkgs/tools/security/beyond-identity/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, dpkg, buildFHSEnv , glibc, glib, openssl, tpm2-tss -, gtk3, gnome, polkit, polkit_gnome +, gtk3, gnome-keyring, polkit, polkit_gnome }: let pname = "beyond-identity"; version = "2.97.0-0"; - libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]); + libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome-keyring polkit polkit_gnome ]); meta = with lib; { description = "Passwordless MFA identities for workforces, customers, and developers"; homepage = "https://www.beyondidentity.com"; @@ -73,7 +73,7 @@ in buildFHSEnv { targetPkgs = pkgs: [ beyond-identity glib glibc openssl tpm2-tss - gtk3 gnome.gnome-keyring + gtk3 gnome-keyring polkit polkit_gnome ]; diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index b4e07a622c24e..acada9b12567f 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cariddi"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "edoardottt"; repo = "cariddi"; rev = "refs/tags/v${version}"; - hash = "sha256-Hgz+/DEoCo4lxcFkawQgIc3ct7cc2NwpAnfBtZQruf0="; + hash = "sha256-mRrUTRknax3b4hs3frQMzg0GyB3WjMDZJk0RQSAC88U="; }; - vendorHash = "sha256-GgJyYDnlaFybf3Gu1gVcA12HkA0yUIjYEFj0G83GVGQ="; + vendorHash = "sha256-ML1aLbrYhs2IxnN2ywKFOpvAV6yuYb8GI+dtoxwJl4A="; ldflags = [ "-w" diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/tools/security/chainsaw/default.nix index fc1e773ce9aa2..a298b3f26ba7d 100644 --- a/pkgs/tools/security/chainsaw/default.nix +++ b/pkgs/tools/security/chainsaw/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "chainsaw"; - version = "2.9.1"; + version = "2.9.1-2"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; rev = "refs/tags/v${version}"; - hash = "sha256-9UmyHf2aH6ODGEbsDBBD8pLRkRtOpc9HGKp9UV7mk0o="; + hash = "sha256-daedJZnWq9UnMDY9P9npngfFbGsv5MSDP4Ep/Pr++ek="; }; - cargoHash = "sha256-f4EDtRFjRU62Nuzaq5EbL+/sCKyMMgSOu6MaFsuAFec="; + cargoHash = "sha256-eSpyh8wnZWU5rY6qhKtxQUFkhkZXzIB2ycPab9LC+OA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 357f097a158d3..72ceb4fca000c 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.10.0"; + version = "11.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-t8TuFjNpsVE5Xq3EloUAJH8ZqiCbZlIm9yzWTGr+E98="; + hash = "sha256-G2mVr0TB5BBzBdo4YcE3gH2jU9iZ9UuTgrYlqsEhQXs="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-npnZ/eTfA6GVga6p9XKMMU6YbECN657QMMEQA/pgLfc="; + vendorHash = "sha256-aXt/Ehh1G9k0rYGOrdbpddVB4faGTkOy0zWSz2X8BtI="; ldflags = [ "-w" diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index c74c2aa6b05a1..e2d9842ca4f2f 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-06-27"; + version = "2024-07-02"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-8TYraSY6dA7Q9CE9sTjfteNzrVIc6CuMPD6umOmAoHk="; + hash = "sha256-lgnuUsIbRDtI5/KA9EBJxNfDTel/1+7VjLLMAoB0il0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 2a3bb65f8a79b..3c739602514c8 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -164,6 +164,7 @@ stdenv.mkDerivation (finalAttrs: { genericName = "Ghidra Software Reverse Engineering Suite"; categories = [ "Development" ]; terminal = false; + startupWMClass = "ghidra-Ghidra"; }) ]; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 2788fe15974ec..fc9b4d2853dcb 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -20,6 +20,8 @@ let desktopName = "Ghidra"; genericName = "Ghidra Software Reverse Engineering Suite"; categories = [ "Development" ]; + terminal = false; + startupWMClass = "ghidra-Ghidra"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 6f77eab11323a..0b575daa629b6 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,11 +1,11 @@ { stdenv, substituteAll, lib, buildGoModule, fetchFromGitHub -, AVFoundation, AudioToolbox, ImageIO, CoreMedia +, AppKit, AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox, gnupg }: buildGoModule rec { pname = "keybase"; - version = "6.2.8"; + version = "6.3.1"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,9 +16,9 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - hash = "sha256-k/AMJNXS/gabJMjXdrQltxxc1Bez4VIR/l8RXXpiPWw="; + hash = "sha256-kmKqVtHS0DaVa0of+QEUc2aEhWP1dNmzb/L01zaIoe8="; }; - vendorHash = "sha256-DNTJtgZ2jDuEu4XqxbPTHLh+NR0vU2hcNNcD4amIDk4="; + vendorHash = "sha256-KHahkGzkXr6xp0XY9MyEeeiHnmphaNYi9dPBQ476+us="; patches = [ (substituteAll { @@ -28,7 +28,7 @@ buildGoModule rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; tags = [ "production" ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index 7fb9288b731b1..b6ecf84f835b2 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BS/jJbseLcWtK9BX7ZbVokSrboUaaTCIr4cwpixl1QI="; + hash = "sha256-vP/BK3hOBrEAPrg+Bltg0GdyvAQyUffEtXoK3B3CEjs="; }; vendorHash = "sha256-bq8nz4i40xd4O6/r2ZiUyAEKxmsoLCNKctqRV/GPQEU="; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 55597617ab4d7..125546793296e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.14" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.15" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 877afc8a4f9d0..f8839316b6a1c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 685168ecf3266361a8e7836b2a7889751b7d20b8 - ref: refs/tags/6.4.14 + revision: b4a408704631fd0a0a4587f1f1a0017bcec9fb45 + ref: refs/tags/6.4.15 specs: - metasploit-framework (6.4.14) + metasploit-framework (6.4.15) aarch64 abbrev actionpack (~> 7.0.0) @@ -44,7 +44,7 @@ GIT metasploit-model metasploit-payloads (= 2.0.166) metasploit_data_models - metasploit_payloads-mettle (= 1.0.26) + metasploit_payloads-mettle (= 1.0.28) mqtt msgpack (~> 1.6.0) mutex_m @@ -280,7 +280,7 @@ GEM railties (~> 7.0) recog webrick - metasploit_payloads-mettle (1.0.26) + metasploit_payloads-mettle (1.0.28) method_source (1.1.0) mini_portile2 (2.8.6) minitest (5.23.1) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index e5844a655017f..6bd3bf152e58c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.14"; + version = "6.4.15"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-aUxHCeRBlE0CQuroxge9A/O1LA9DfQJwuwWZsPUKz1A="; + hash = "sha256-CJXti/pX2Q59fJgRbAodUDMlMHIJH0eh3kOZxrQEllY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index ee76850346098..c1918985810b3 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "685168ecf3266361a8e7836b2a7889751b7d20b8"; - sha256 = "0l6g1bsv1685pdq04za31wnbbwq3pl3wds7a8814v521wh4lfk39"; + rev = "b4a408704631fd0a0a4587f1f1a0017bcec9fb45"; + sha256 = "0mln0jscd6a3vshlf7q9f8q2acsh3l56q4cqgiyhxnapza5yv588"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.14"; + version = "6.4.15"; }; metasploit-model = { groups = ["default"]; @@ -766,10 +766,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qprmbmpw4c8396m0whbp08xzdbjc0s2zd0jkxqnh3aswmx8pj3m"; + sha256 = "0649y1zc2pncfalsa5nkszmbiz1gfg4q3bhh4p2q6vwaac5g6sfj"; type = "gem"; }; - version = "1.0.26"; + version = "1.0.28"; }; method_source = { groups = ["default"]; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index bd2cdbfbbbab7..4e2ad4b53c9a0 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation { homepage = "https://github.com/carnager/rofi-pass"; license = lib.licenses.gpl3; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lilyinstarlight ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index f2854b680dd41..2918343d13734 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "1.0.2"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-/Nciqf8O/Sq2zniaKid1VkYC/H6hgsVzMtOtFy/CiR8="; + hash = "sha256-bBKNKgS3V/sZ8lZMk2ZwTzOVaVecSR9GhNP2FNkWbw0="; }; postPatch = '' diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index 82e4d3624d1e6..477b47057ee45 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.9.6"; + version = "1.10.0"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wubrZJBPLA83VB57UVKLuh2cmyXHouwN4BVPiHFl+1s="; + sha256 = "sha256-4S+Pko8uMZmVVB5vjG6Y1mBB3RFtwBBrH2T6FPrss9s="; }; - vendorHash = "sha256-tx0zIr9rXuOvt+77Sp6dIdtN21fDX5FdnTxGpHWo7+A="; + vendorHash = "sha256-U8JGj1hsV0ySREcWZeA243FO/8VPSZ1KUIsVrw1P5H0="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 2b33564b683ff..7fe1ca2f85faa 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.57"; + version = "3.5.58"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-86YusgyLUveMrXepAtnABgdZCGlQDQjVFnG9GqFnCIg="; + hash = "sha256-mwfLCZfjAtKNfp9Cc8hkLAOKo6VfKD3l+IDiXDP2LV8="; }; strictDeps = true; diff --git a/pkgs/tools/system/mediawriter/default.nix b/pkgs/tools/system/mediawriter/default.nix index 8740a9b8a1e1b..e2ff1f610782b 100644 --- a/pkgs/tools/system/mediawriter/default.nix +++ b/pkgs/tools/system/mediawriter/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "mediawriter"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; rev = "refs/tags/${version}"; - hash = "sha256-I4q9VARQiZf+Qz83EToyUj+eS3CTPsxEw0paACS8lmE="; + hash = "sha256-KyABM3XIHvd9kT7aayYivGw6kjLf55Gpkk041BQ4yw0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index a7503baac14b5..a89538b2966b6 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-rnoIuftPmx1Qbn2ifEBGz4RiA/lBVemjMjcPr9Woflc="; + hash = "sha256-MdaMK65PWreIPTuhsm+2ZVRQ8t/wYijkENk8qvX9oEM="; }; vendorHash = null; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 383c281bd2120..66f824ac48d02 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "tree"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitLab { owner = "OldManProgrammer"; repo = "unix-tree"; rev = version; - sha256 = "sha256-aPz1ROUeAKDmMjEtAaL2AguF54/CbIYWpL4Qovv2ftQ="; + sha256 = "sha256-1iBGbzNwjUX7kqkk6XzKISO2e6b05MBH08XgIwR+nyI="; }; preConfigure = '' diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 456b2c568d820..f322a6f7d7c34 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kdiff3"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz"; - hash = "sha256-MPFKWrbg1VEWgpF42CdlTDDoQhwE/pcA085npTCEYpg="; + hash = "sha256-kYU3dcP6qVIkaOwSPNbedGYqy21RFkdZlqyk3Cw778g="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index 1b8dad394c9a2..eecfbe0d83abd 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.30"; + version = "0.4.31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "sad"; rev = "refs/tags/v${version}"; - hash = "sha256-pTCdoKY/+ubUY3adN/Cqop0Gvuqh6Bs55arjT9mjQ18="; + hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko="; }; - cargoHash = "sha256-ndl0jFQA30h90nnEcIl2CXfF/+cuj/UqUV/7ilsUPb4="; + cargoHash = "sha256-2oZf2wim2h/krGZMg7Psxx0VLFE/Xf1d1vWqkVtjSmo="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/video/blackmagic-desktop-video/default.nix b/pkgs/tools/video/blackmagic-desktop-video/default.nix deleted file mode 100644 index d8d6e7f2a169b..0000000000000 --- a/pkgs/tools/video/blackmagic-desktop-video/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv -, cacert -, curl -, runCommandLocal -, lib -, autoPatchelfHook -, libcxx -, libGL -, gcc7 -}: - -stdenv.mkDerivation rec { - pname = "blackmagic-desktop-video"; - version = "12.9a3"; - - buildInputs = [ - autoPatchelfHook - libcxx - libGL - gcc7.cc.lib - ]; - - # yes, the below download function is an absolute mess. - # blame blackmagicdesign. - src = runCommandLocal "${pname}-${lib.versions.majorMinor version}-src.tar.gz" - rec { - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-H7AHD6u8KsJoL+ug3QCqxuPfMP4A0nHtIyKx5IaQkdQ="; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - - nativeBuildInputs = [ curl ]; - - # ENV VARS - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - # from the URL that the POST happens to, see browser console - DOWNLOADID = "495ebc707969447598c2f1cf0ff8d7d8"; - # from the URL the download page where you click the "only download" button is at - REFERID = "6e65a87d97bd49e1915c57f8df255f5c"; - SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}"; - - USERAGENT = builtins.concatStringsSep " " [ - "User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})" - "AppleWebKit/537.36 (KHTML, like Gecko)" - "Chrome/77.0.3865.75" - "Safari/537.36" - ]; - - REQJSON = builtins.toJSON { - "country" = "nl"; - "downloadOnly" = true; - "platform" = "Linux"; - "policy" = true; - }; - - } '' - RESOLVEURL=$(curl \ - -s \ - -H "$USERAGENT" \ - -H 'Content-Type: application/json;charset=UTF-8' \ - -H "Referer: https://www.blackmagicdesign.com/support/download/$REFERID/Linux" \ - --data-ascii "$REQJSON" \ - --compressed \ - "$SITEURL") - - curl \ - --retry 3 --retry-delay 3 \ - --compressed \ - "$RESOLVEURL" \ - > $out - ''; - - postUnpack = let - arch = stdenv.hostPlatform.uname.processor; - in '' - tar xf Blackmagic_Desktop_Video_Linux_${lib.head (lib.splitString "a" version)}/other/${arch}/desktopvideo-${version}-${arch}.tar.gz - unpacked=$NIX_BUILD_TOP/desktopvideo-${version}-${stdenv.hostPlatform.uname.processor} - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,share/doc,lib/systemd/system} - cp -r $unpacked/usr/share/doc/desktopvideo $out/share/doc - cp $unpacked/usr/lib/*.so $out/lib - cp $unpacked/usr/lib/systemd/system/DesktopVideoHelper.service $out/lib/systemd/system - cp $unpacked/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper $out/bin/ - - substituteInPlace $out/lib/systemd/system/DesktopVideoHelper.service --replace "/usr/lib/blackmagic/DesktopVideo/DesktopVideoHelper" "$out/bin/DesktopVideoHelper" - - runHook postInstall - ''; - - # need to tell the DesktopVideoHelper where to find its own library - appendRunpaths = [ "${placeholder "out"}/lib" ]; - - meta = with lib; { - homepage = "https://www.blackmagicdesign.com/support/family/capture-and-playback"; - maintainers = [ maintainers.hexchen ]; - license = licenses.unfree; - description = "Supporting applications for Blackmagic Decklink. Doesn't include the desktop applications, only the helper required to make the driver work"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/video/recyclarr/default.nix b/pkgs/tools/video/recyclarr/default.nix index 6db69039205cb..aef05e2a731fb 100644 --- a/pkgs/tools/video/recyclarr/default.nix +++ b/pkgs/tools/video/recyclarr/default.nix @@ -26,10 +26,10 @@ let or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-Skf3wY52B6KnWS8YurAL0b5Sdkvp4YYn3IvHrAKyvK8="; - arm64-linux_hash = "sha256-66OCz13eLyAfEC3kYUniqq+QhsHoZNBJieXmmsLG5eM="; - x64-osx_hash = "sha256-6cNpfcjwgfxZRlBnZQrZLMPaXDHEXSbS3Z/qcx1Z3HA="; - arm64-osx_hash = "sha256-OkM+LgqXOHzyzEWH6D3czH86Sncym9FpfTFaacp2aN0="; + x64-linux_hash = "sha256-LMAY1UIwvB+ne4rpwLKaYO6QGTwdiS3YBndr73zIzvQ="; + arm64-linux_hash = "sha256-by3PSYdN7TPjA0Cx4pfzIbpZ/YVU1agfcuvuZh6mbfU="; + x64-osx_hash = "sha256-/YqdlVktgbBUNdm+mAD053pf6wCMXYt6gQP+iTQdKqw="; + arm64-osx_hash = "sha256-2RRQGNTztK14KDFRqgpagNCWTizHVNY67psaxFfyDZ4="; }."${arch}-${os}_hash"; libPath = { @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "recyclarr"; - version = "6.0.2"; + version = "7.0.0"; src = fetchurl { url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz"; diff --git a/pkgs/tools/video/rwedid/default.nix b/pkgs/tools/video/rwedid/default.nix index 238f1fd5189a4..eea8a86c8cc3b 100644 --- a/pkgs/tools/video/rwedid/default.nix +++ b/pkgs/tools/video/rwedid/default.nix @@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://codeberg.org/ral/rwedid"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index dafe1c2fda273..5e8810a991b95 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.37.3"; + version = "0.38.0"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-lqErey/uht+ub6deGgGNbytf0mhxgRekqe4y53Gtbms="; + sha256 = "sha256-ZwqDPtoR3jFV5h8Ufie5fmiTueu2twueFf6swrpdYq4="; }; vendorHash = "sha256-1EAQMYaTEtfAiu7+UTkC7QZwSWC1Ihwj9leTd90T0ZU="; diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix index 5133d4477fab1..d99e1164d9aa0 100644 --- a/pkgs/tools/virtualization/jumppad/default.nix +++ b/pkgs/tools/virtualization/jumppad/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-ovPXjSHTCv7ke8k0iOqB4jB4R3cRMJ5cFkpptPrAr+g="; + hash = "sha256-jG/XTMkedgDSncCW7YbII3g3ieB1i0Z9cOEVfZiczHI="; }; - vendorHash = "sha256-39CORZ5qqbMJuTzYt1sKbHPPYkQEwQWSIQ4hWqdUFmk="; + vendorHash = "sha256-FPM0q1ZVDfo00Z6QEXqtqfx77qkq5HhB+3vF9z9zrM0="; subPackages = [ "." ]; diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 4dea9b153d853..9a00c7d163dca 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-L8UdT3hQO4IrXkpOL0bjpy6OwNJQR8EG0+MgXVXzoBU="; + hash = "sha256-SWLXY7SsoeJFr2RLOtVSnt5Knx44+9hNIy50NzN602k="; }; - vendorHash = "sha256-TGLxcH6wg8fObLsSKKdBgIbb7t4YBP+pUWNNHlEZtaw="; + vendorHash = "sha256-74El20C7kE0lLAng9wQL7MnfcJLtPR2cAk00CuO4NlY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/wayland/wl-color-picker/default.nix b/pkgs/tools/wayland/wl-color-picker/default.nix index bb5f21ded61df..22f6821a10223 100644 --- a/pkgs/tools/wayland/wl-color-picker/default.nix +++ b/pkgs/tools/wayland/wl-color-picker/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , slurp , grim -, gnome +, zenity , wl-clipboard , imagemagick , makeWrapper @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { --replace 'grim' "${grim}/bin/grim" \ --replace 'slurp' "${slurp}/bin/slurp" \ --replace 'convert' "${imagemagick}/bin/convert" \ - --replace 'zenity' "${gnome.zenity}/bin/zenity" \ + --replace 'zenity' "${zenity}/bin/zenity" \ --replace 'wl-copy' "${wl-clipboard}/bin/wl-copy" ''; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { grim slurp imagemagick - gnome.zenity + zenity wl-clipboard ]} mkdir -p $out/bin diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index acc961aa9bb10..aed694c002390 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-/ZxTFr5Mmg1UoJikweGJThREgutKCF0C5IwxEZ3bv7Q="; + hash = "sha256-a/wBHfLQf2RTd6FsiScewm+KOPyCrS/IaJDsi6+zJfI="; }; strictDeps = true; diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 1e0e6e0a2d586..d1097a48327bc 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -35,5 +35,7 @@ let agdarsec = callPackage ../development/libraries/agda/agdarsec { }; _1lab = callPackage ../development/libraries/agda/1lab { }; + + generics = callPackage ../development/libraries/agda/generics { }; }; in mkAgdaPackages Agda diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8a5e10e86faf7..e4fecb5c991d6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -133,6 +133,7 @@ mapAliases ({ bitwarden = bitwarden-desktop; # Added 2024-02-25 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 + blackmagic-desktop-video = throw "blackmagic-desktop-video has been due to being unmaintained"; # Added 2024-07-02 blender-with-packages = args: lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" (blender.withPackages (_: args.packages)).overrideAttrs @@ -156,6 +157,7 @@ mapAliases ({ bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 + butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; buildFHSUserEnvChroot = buildFHSEnvChroot; @@ -209,6 +211,7 @@ mapAliases ({ collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 + coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 @@ -562,6 +565,7 @@ mapAliases ({ gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 + gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 @@ -695,6 +699,7 @@ mapAliases ({ libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 + libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = libgpg-error; # Added 2021-09-04 libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 @@ -1350,6 +1355,7 @@ mapAliases ({ tkcvs = tkrev; # Added 2022-03-07 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 + tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5020c42dfb9b..77b6a3e34d3a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -837,9 +837,11 @@ with pkgs; grsync = callPackage ../applications/misc/grsync { }; + devShellTools = callPackage ../build-support/dev-shell-tools { }; + dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; - } // { __attrsFailEvaluation = true; }; + }; fakeNss = callPackage ../build-support/fake-nss { }; @@ -1073,14 +1075,14 @@ with pkgs; fetchpatch = callPackage ../build-support/fetchpatch { # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 - patchutils = buildPackages.patchutils_0_3_3; + patchutils = __splicedPackages.patchutils_0_3_3; } // { tests = pkgs.tests.fetchpatch; version = 1; }; fetchpatch2 = callPackage ../build-support/fetchpatch { - patchutils = buildPackages.patchutils_0_4_2; + patchutils = __splicedPackages.patchutils_0_4_2; } // { tests = pkgs.tests.fetchpatch2; version = 2; @@ -1641,7 +1643,6 @@ with pkgs; aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; @@ -1689,10 +1690,6 @@ with pkgs; btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { }; - butler = callPackage ../by-name/bu/butler/package.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; cf-vault = callPackage ../tools/admin/cf-vault { }; @@ -2774,9 +2771,7 @@ with pkgs; vice = callPackage ../applications/emulators/vice { }; - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { - inherit (gnome) zenity; - }; + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { }; xcpc = callPackage ../applications/emulators/xcpc { }; @@ -3475,8 +3470,6 @@ with pkgs; bkyml = callPackage ../tools/misc/bkyml { }; - blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; bmap-tools = callPackage ../tools/misc/bmap-tools { }; @@ -4552,14 +4545,14 @@ with pkgs; cloudflared = callPackage ../applications/networking/cloudflared { # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250 buildGoModule = buildGoModule.override { - go = go_1_21.overrideAttrs { + go = go_1_22.overrideAttrs { pname = "cloudflare-go"; - version = "0-unstable-2023-12-06"; + version = "1.22.2-devel-cf"; src = fetchFromGitHub { owner = "cloudflare"; repo = "go"; - rev = "34129e47042e214121b6bbff0ded4712debed18e"; - sha256 = "sha256-RA9KTY4cSxIt7dyJgAFQPemc6YBgcSwc/hqB4JHPxng="; + rev = "ec0a014545f180b0c74dfd687698657a9e86e310"; + sha256 = "sha256-oQQ9Jyh8TphZSCaHqaugTL7v0aeZjyOdVACz86I2KvU="; }; }; }; @@ -5825,7 +5818,7 @@ with pkgs; monetdb = callPackage ../servers/sql/monetdb { }; - monado = callPackage ../applications/graphics/monado { + monado = callPackage ../by-name/mo/monado/package.nix { inherit (gst_all_1) gstreamer gst-plugins-base; }; @@ -6756,9 +6749,7 @@ with pkgs; libsbsms_2_3_0 ; - libskk = callPackage ../development/libraries/libskk { - inherit (gnome) gnome-common; - }; + libskk = callPackage ../development/libraries/libskk { }; m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; @@ -6810,6 +6801,8 @@ with pkgs; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; + pinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-pinyin { }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; @@ -9458,7 +9451,7 @@ with pkgs; # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 # #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc # with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25 - inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; @@ -9469,8 +9462,6 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - keymapp = callPackage ../applications/misc/keymapp { }; - keyscope = callPackage ../tools/security/keyscope { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security; }; @@ -9564,7 +9555,7 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14; in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; @@ -10141,9 +10132,7 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; - liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome) gnome-common; - }; + liblangtag = callPackage ../development/libraries/liblangtag { }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -16012,8 +16001,7 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); + graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { }; graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; @@ -16443,7 +16431,9 @@ with pkgs; makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { + stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. + }); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; @@ -16639,8 +16629,6 @@ with pkgs; cauwugo = callPackage ../development/tools/rust/cauwugo { }; - crate2nix = callPackage ../development/tools/rust/crate2nix { }; - critcmp = callPackage ../development/tools/rust/critcmp { }; devspace = callPackage ../development/tools/misc/devspace { }; @@ -21966,9 +21954,6 @@ with pkgs; libglibutil = callPackage ../development/libraries/libglibutil { }; - libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome.libgnome-keyring; - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { }; @@ -24980,6 +24965,7 @@ with pkgs; mockobjects = callPackage ../development/libraries/java/mockobjects { }; saxonb = saxonb_8_8; + saxon-he = saxon_12-he; inherit (callPackages ../development/libraries/java/saxon { jre = jre_headless; @@ -24989,7 +24975,8 @@ with pkgs; saxonb_8_8 saxonb_9_1 saxon_9-he - saxon-he; + saxon_11-he + saxon_12-he; smack = callPackage ../development/libraries/java/smack { }; @@ -25143,17 +25130,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; + sbcl_2_4_5 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_5 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; + sbcl_2_4_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_5; + sbcl = sbcl_2_4_6; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25251,39 +25238,26 @@ with pkgs; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; - mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; - - # Redwax collection mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; - mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; - mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; - mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; - mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; - mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; - mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; - + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - - - mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - + mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; + mod_jk = callPackage ../servers/http/apache-modules/mod_jk { }; + mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp { }; + mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_spkac = callPackage ../servers/http/apache-modules/mod_spkac { }; mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; - + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; - - mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; - - mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; - php = pkgs.php.override { inherit apacheHttpd; }; - subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; } // lib.optionalAttrs config.allowAliases { mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; @@ -25503,6 +25477,7 @@ with pkgs; freeradius = callPackage ../servers/freeradius { }; freshrss = callPackage ../servers/web-apps/freshrss { }; + freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { }); freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -25965,8 +25940,6 @@ with pkgs; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; - tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; - tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; pies = callPackage ../servers/pies { }; @@ -27662,6 +27635,8 @@ with pkgs; sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { }; + sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { }; + sdparm = callPackage ../os-specific/linux/sdparm { }; sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { @@ -28498,7 +28473,6 @@ with pkgs; kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -28619,6 +28593,10 @@ with pkgs; marwaita = callPackage ../data/themes/marwaita { }; + marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { + inherit (kdePackages) breeze-icons; + }; + marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; @@ -28739,7 +28717,6 @@ with pkgs; }; numix-icon-theme = callPackage ../data/icons/numix-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (plasma5Packages) breeze-icons; }; @@ -28846,9 +28823,7 @@ with pkgs; pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -29006,9 +28981,7 @@ with pkgs; recursive = callPackage ../data/fonts/recursive { }; - reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { }; rubik = callPackage ../data/fonts/rubik { }; @@ -29092,7 +29065,6 @@ with pkgs; the-neue-black = callPackage ../data/fonts/the-neue-black { }; tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5) breeze-icons; }; @@ -29400,6 +29372,10 @@ with pkgs; android-studio = androidStudioPackages.stable; android-studio-full = android-studio.full; + androidStudioForPlatformPackages = recurseIntoAttrs + (callPackage ../applications/editors/android-studio-for-platform { }); + android-studio-for-platform = androidStudioForPlatformPackages.stable; + antfs-cli = callPackage ../applications/misc/antfs-cli { }; antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; @@ -29587,8 +29563,6 @@ with pkgs; awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome) baobab; - badwolf = callPackage ../applications/networking/browsers/badwolf { }; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -29926,10 +29900,6 @@ with pkgs; coreth = callPackage ../applications/networking/coreth { }; - coriander = callPackage ../applications/video/coriander { - inherit (gnome2) libgnomeui GConf; - }; - cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; csa = callPackage ../applications/audio/csa { }; @@ -30109,7 +30079,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_24 docker_25 docker_26; + docker_24 docker_25 docker_26 docker_27; docker = docker_24; docker-client = docker.override { clientOnly = true; }; @@ -30189,9 +30159,7 @@ with pkgs; dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; - dvdstyler = callPackage ../applications/video/dvdstyler { - inherit (gnome2) libgnomeui; - }; + dvdstyler = callPackage ../applications/video/dvdstyler { }; dyff = callPackage ../development/tools/dyff { }; @@ -30316,8 +30284,6 @@ with pkgs; epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome) epiphany; - ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; epic5 = callPackage ../applications/networking/irc/epic5 { }; @@ -30405,8 +30371,6 @@ with pkgs; keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome) evince; - evolution-data-server = gnome.evolution-data-server; evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; @@ -30743,8 +30707,6 @@ with pkgs; gthumb = callPackage ../applications/graphics/gthumb { }; - inherit (gnome) gucharmap; - guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -30851,7 +30813,6 @@ with pkgs; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; }; @@ -30861,7 +30822,6 @@ with pkgs; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { - inherit (gnome) adwaita-icon-theme; channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; @@ -30872,7 +30832,6 @@ with pkgs; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "developer-edition"; generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix; }; @@ -31021,8 +30980,6 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; - inherit (gnome) gitg; - gmrun = callPackage ../applications/misc/gmrun { }; gnucash = callPackage ../applications/office/gnucash { }; @@ -31100,8 +31057,8 @@ with pkgs; metacubexd = callPackage ../by-name/me/metacubexd/package.nix { pnpm = callPackage ../development/tools/pnpm/generic.nix { - version = "9.1.4"; - hash = "sha256-MKGAGsTnI3ee/tE6IfTDn562yfu0ztEBvOBrQiWT18k="; + version = "9.4.0"; + hash = "sha256-tv0L/aVV5+WErX5WswxosB1aBPnuk5ifS5PKhHPEnHQ="; }; }; @@ -31204,9 +31161,7 @@ with pkgs; gnomecast = callPackage ../applications/video/gnomecast { }; - gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome) gnome-autoar; - }; + gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; gollum = callPackage ../applications/misc/gollum { }; @@ -31967,23 +31922,10 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics - CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration - Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo - CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; - + kotatogram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { stdenv = if stdenv.isDarwin - then overrideSDK llvmPackages_14.stdenv "11.0" + then overrideSDK stdenv "11.0" else stdenv; - - # telegram-desktop has random crashes when jemalloc is built with gcc. - # Apparently, it triggers some bug due to usage of gcc's builtin - # functions like __builtin_ffsl by jemalloc when it's built with gcc. - jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs { - # no idea how to fix the tests :( - doCheck = false; - }; }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -32501,9 +32443,7 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { - inherit (gnome) zenity; - }; + mepo = callPackage ../applications/misc/mepo { }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -32818,14 +32758,12 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - protobuf = protobuf_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - protobuf = protobuf_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -33764,7 +33702,6 @@ with pkgs; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { }; quodlibet = callPackage ../applications/audio/quodlibet { - inherit (gnome) adwaita-icon-theme; kakasi = null; keybinder3 = null; libappindicator-gtk3 = null; @@ -33976,9 +33913,7 @@ with pkgs; rusty-psn-gui = rusty-psn.override { withGui = true; }; - rymcast = callPackage ../applications/audio/rymcast { - inherit (gnome) zenity; - }; + rymcast = callPackage ../applications/audio/rymcast { }; rymdport = callPackage ../applications/networking/rymdport { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -34059,8 +33994,6 @@ with pkgs; sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; - simple-scan = gnome.simple-scan; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; siproxd = callPackage ../applications/networking/siproxd { }; @@ -34358,7 +34291,6 @@ with pkgs; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; surge = callPackage ../applications/audio/surge { - inherit (gnome) zenity; git = gitMinimal; }; @@ -34587,7 +34519,6 @@ with pkgs; desktopName = "Thunderbird"; }; thunderbird-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (gnome) adwaita-icon-theme; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; @@ -34882,9 +34813,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; }; - verbiste = callPackage ../applications/misc/verbiste { - inherit (gnome2) libgnomeui; - }; + verbiste = callPackage ../applications/misc/verbiste { }; veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; @@ -34894,7 +34823,11 @@ with pkgs; vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; - macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; + macvim = let + macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { }; + in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix { + stdenv = clangStdenv; + }); vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; @@ -34944,14 +34877,10 @@ with pkgs; }; neovim = wrapNeovim neovim-unwrapped { }; - neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - viw = callPackage ../applications/editors/viw { }; virter = callPackage ../applications/virtualization/virter { }; @@ -35604,8 +35533,6 @@ with pkgs; yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome) yelp; - yelp-tools = callPackage ../development/misc/yelp-tools { }; yewtube = callPackage ../applications/misc/yewtube { }; @@ -35729,7 +35656,6 @@ with pkgs; alfis = callPackage ../applications/blockchains/alfis { inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; - inherit (gnome) zenity; }; alfis-nogui = alfis.override { withGui = false; @@ -36571,10 +36497,6 @@ with pkgs; graphwar = callPackage ../games/graphwar { }; - gtetrinet = callPackage ../games/gtetrinet { - inherit (gnome2) GConf libgnome libgnomeui; - }; - gtypist = callPackage ../games/gtypist { }; gweled = callPackage ../games/gweled { }; @@ -37480,8 +37402,6 @@ with pkgs; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome.gnome-themes-extra; - xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE/CHEMISTY @@ -38030,8 +37950,6 @@ with pkgs; p4est-sc = p4est-sc-dbg; }; - petsc = callPackage ../development/libraries/science/math/petsc { }; - parmetis = callPackage ../development/libraries/science/math/parmetis { }; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; @@ -40312,8 +40230,6 @@ with pkgs; dart = callPackage ../development/compilers/dart { }; - dart-sass = callPackage ../development/tools/misc/dart-sass { }; - pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { }); buildDartApplication = callPackage ../build-support/dart/build-dart-application { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 104d8821ff6a4..bc80ec658846c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -343,7 +343,7 @@ in { dddvb = callPackage ../os-specific/linux/dddvb { }; - decklink = callPackage ../os-specific/linux/decklink { }; + decklink = throw "The decklink kernel module has been removed due to being unmaintained"; # Module removed on 2024-07-02 digimend = callPackage ../os-specific/linux/digimend { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e39b990ecae10..4b47c2d974dc6 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -173,7 +173,7 @@ rec { }) {}; nfd = callPackage ../development/lua-modules/nfd { - inherit (pkgs.gnome) zenity; + inherit (pkgs) zenity; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 259864f22a789..fe284a62718df 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2036,13 +2036,6 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages = ocamlPackages_5_1; - # This is a nasty way to replace toplevel janestreet attributes in the scope, - # so that modules outside of ocamlPackages that depend on JS OCaml libraries - # *and* non-JS OCaml libraries can pull in the same version of JS transitive - # dependencies. Remove this once ligo and stanc can be compiled against - # janestreet 0.16 libraries. - ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15); - # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4a11a1732847a..a7d2bfd6bff23 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10916,68 +10916,6 @@ with self; { }; }; - Gnome2 = buildPerlPackage { - pname = "Gnome2"; - version = "1.048"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.048.tar.gz"; - hash = "sha256-ZPzDgnFKvY1XaSrDdjKMOiDGy8i81zKwB9FMv5ooLd0="; - }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; - propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; - meta = { - description = "(DEPRECATED) Perl interface to the 2.x series of the GNOME libraries"; - homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gnome2Canvas.x86_64-darwin - }; - }; - - Gnome2Canvas = buildPerlPackage { - pname = "Gnome2-Canvas"; - version = "1.006"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.006.tar.gz"; - hash = "sha256-aQZnxziSHeLWUWtOtjlVOlceSoMQ2AMfFYZYU23lq0I="; - }; - buildInputs = [ pkgs.gnome2.libgnomecanvas ]; - propagatedBuildInputs = [ Gtk2 ]; - doCheck = !stdenv.isDarwin; - meta = { - description = "(DEPRECATED) A structured graphics canvas"; - license = with lib.licenses; [ lgpl2Plus ]; - }; - }; - - Gnome2VFS = buildPerlPackage { - pname = "Gnome2-VFS"; - version = "1.084"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.084.tar.gz"; - hash = "sha256-PI2Mlca2XCN9ueiJx57bK7gIvzfAhKvfu9mFn+93h8w="; - }; - propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; - meta = { - description = "(DEPRECATED) Perl interface to the 2.x series of the GNOME VFS"; - license = with lib.licenses; [ lgpl21Plus ]; - }; - }; - - Gnome2Wnck = buildPerlPackage { - pname = "Gnome2-Wnck"; - version = "0.18"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Wnck-0.18.tar.gz"; - hash = "sha256-RL7OyLLX9B8ngKc7CSJp/bec1JJluuDI/zkQN8RWSjU="; - }; - buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; - propagatedBuildInputs = [ Gtk2 ]; - meta = { - description = "(DEPRECATED) Perl interface to the Window Navigator"; - license = with lib.licenses; [ lgpl21Plus ]; - }; - }; - GnuPG = buildPerlPackage { pname = "GnuPG"; version = "0.19"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 09a3029bda537..2a126eec99873 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -132,6 +132,7 @@ mapAliases ({ django_hijack_admin = django-hijack-admin; # added 2023-05-16 django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21 django_modelcluster = django-modelcluster; # added 2022-04-02 + django-mysql = throw "django-mysql has been removed, since it was an unused leaf package"; # added 2024-07-02 django_nose = django-nose; # added 2023-07-25 django-nose = throw "django-nose has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21 django_reversion = django-reversion; # added 2022-06-18 @@ -160,6 +161,7 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 factory_boy = factory-boy; # added 2023-10-08 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 + faster-fifo = throw "faster-fifo has been removed since it was an unused leaf package"; # added 2024-07-02 fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03 fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b165d64e4eb8..16ffb80ef7e9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -491,6 +491,8 @@ self: super: with self; { alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + albucore = callPackage ../development/python-modules/albucore { }; + albumentations = callPackage ../development/python-modules/albumentations { }; ale-py = callPackage ../development/python-modules/ale-py { }; @@ -2973,6 +2975,8 @@ self: super: with self; { deltachat2 = callPackage ../development/python-modules/deltachat2 { }; + deltalake = callPackage ../development/python-modules/deltalake { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; demes = callPackage ../development/python-modules/demes { }; @@ -3321,8 +3325,6 @@ self: super: with self; { django-mptt = callPackage ../development/python-modules/django-mptt { }; - django-mysql = callPackage ../development/python-modules/django-mysql { }; - django-ninja = callPackage ../development/python-modules/django-ninja { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -4177,8 +4179,6 @@ self: super: with self; { fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; - faster-fifo = callPackage ../development/python-modules/faster-fifo { }; - faster-whisper = callPackage ../development/python-modules/faster-whisper { }; fastimport = callPackage ../development/python-modules/fastimport { }; @@ -4471,6 +4471,8 @@ self: super: with self; { flit-core = callPackage ../development/python-modules/flit-core { }; + flit-gettext = callPackage ../development/python-modules/flit-gettext { }; + flit-scm = callPackage ../development/python-modules/flit-scm { }; floret = callPackage ../development/python-modules/floret { }; @@ -9091,6 +9093,8 @@ self: super: with self; { plugp100 = callPackage ../development/python-modules/plugp100 {}; + python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; + python-ndn = callPackage ../development/python-modules/python-ndn { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -12779,7 +12783,9 @@ self: super: with self; { pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; - pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { + inherit (pkgs.config) cudaSupport; + }; pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { }; @@ -13911,7 +13917,9 @@ self: super: with self; { sentinels = callPackage ../development/python-modules/sentinels { }; - sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; + sentry-sdk_1 = callPackage ../development/python-modules/sentry-sdk/1.nix { }; + sentry-sdk_2 = callPackage ../development/python-modules/sentry-sdk/default.nix { }; + sentry-sdk = sentry-sdk_1; sepaxml = callPackage ../development/python-modules/sepaxml { }; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index a80b40d360605..489c378abf049 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -52,6 +52,7 @@ let pkgsMusl = true; pkgsStatic = true; pkgsCross = true; + pkgsx86_64Darwin = true; pkgsi686Linux = true; pkgsLinux = true; pkgsExtraHardening = true; @@ -70,9 +71,11 @@ let override = true; __functor = true; __functionArgs = true; + __splicedPackages = true; newScope = true; scope = true; pkgs = true; + test-pkgs = true; buildHaskellPackages = true; buildPackages = true; |